From aa9459f319ce36eee12218bc8e4f28d88fe4d90b Mon Sep 17 00:00:00 2001 From: Manikandan Mohan Date: Tue, 15 Dec 2015 15:03:23 -0800 Subject: [PATCH] qcacld-3.0: Fix MDM compilation errors Fix compilation errors in MDM features and when compiled against MDM kernel Change-Id: Iee8fb5f88bfff22117e087f8879d4caf50a945c1 CRs-fixed: 952116 --- core/cds/src/cds_reg_service.c | 5 +++++ core/hdd/src/wlan_hdd_cfg80211.c | 16 ++++++++-------- core/hdd/src/wlan_hdd_ipa.c | 16 ++++++++-------- core/sap/src/sap_module.c | 2 +- core/sme/src/csr/csr_util.c | 2 +- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c index f439c5971efc..19109abf86ce 100644 --- a/core/cds/src/cds_reg_service.c +++ b/core/cds/src/cds_reg_service.c @@ -49,6 +49,11 @@ #define IEEE80211_CHAN_NO_IBSS IEEE80211_CHAN_NO_IR #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0)) +#define IEEE80211_CHAN_NO_20MHZ (1<<11) +#define IEEE80211_CHAN_NO_10MHZ (1<<12) +#endif + static v_REGDOMAIN_t temp_reg_domain = REGDOMAIN_COUNT; /* true if init happens thru init time driver hint */ diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 22646780c844..5b117225fd47 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -615,14 +615,6 @@ static const struct wiphy_wowlan_support wowlan_support_cfg80211_init = { }; #endif -#ifdef FEATURE_WLAN_TDLS - -/* TDLS capabilities params */ -#define PARAM_MAX_TDLS_SESSION \ - QCA_WLAN_VENDOR_ATTR_TDLS_GET_CAPS_MAX_CONC_SESSIONS -#define PARAM_TDLS_FEATURE_SUPPORT \ - QCA_WLAN_VENDOR_ATTR_TDLS_GET_CAPS_FEATURES_SUPPORTED - /** * hdd_add_channel_switch_support()- Adds Channel Switch flag if supported * @flags: Pointer to the flags to Add channel switch flag. @@ -644,6 +636,14 @@ static inline void hdd_add_channel_switch_support(uint32_t *flags) } #endif +#ifdef FEATURE_WLAN_TDLS + +/* TDLS capabilities params */ +#define PARAM_MAX_TDLS_SESSION \ + QCA_WLAN_VENDOR_ATTR_TDLS_GET_CAPS_MAX_CONC_SESSIONS +#define PARAM_TDLS_FEATURE_SUPPORT \ + QCA_WLAN_VENDOR_ATTR_TDLS_GET_CAPS_FEATURES_SUPPORTED + /** * __wlan_hdd_cfg80211_get_tdls_capabilities() - Provide TDLS Capabilites. * @wiphy: WIPHY structure pointer diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 42883c18264f..0e2bd0e51964 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -1403,19 +1403,19 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) "CE RING BASE: 0x%llx\n" "CE RING SIZE: %d\n" "CE REG ADDR : 0x%llx", - hdd_ipa->ce_sr_base_paddr, + (unsigned long long)hdd_ipa->ce_sr_base_paddr, hdd_ipa->ce_sr_ring_size, - hdd_ipa->ce_reg_paddr); + (unsigned long long)hdd_ipa->ce_reg_paddr); CDF_TRACE(CDF_MODULE_ID_HDD, CDF_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", - hdd_ipa->tx_comp_ring_base_paddr, + (unsigned long long)hdd_ipa->tx_comp_ring_base_paddr, hdd_ipa->tx_comp_ring_size, hdd_ipa->tx_num_alloc_buffer, - hdd_ipa->tx_comp_doorbell_paddr); + (unsigned long long)hdd_ipa->tx_comp_doorbell_paddr); CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST RX ====\n" "IND RING BASE: 0x%llx\n" @@ -1425,13 +1425,13 @@ 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", - hdd_ipa->rx_rdy_ring_base_paddr, + (unsigned long long)hdd_ipa->rx_rdy_ring_base_paddr, hdd_ipa->rx_rdy_ring_size, - hdd_ipa->rx_ready_doorbell_paddr, - hdd_ipa->rx_proc_done_idx_paddr, + (unsigned long long)hdd_ipa->rx_ready_doorbell_paddr, + (unsigned long long)hdd_ipa->rx_proc_done_idx_paddr, hdd_ipa->stats.num_rx_excep, hdd_ipa->stats.num_tx_bcmc, - hdd_ipa->stats.num_tx_bcmc_err); + (unsigned long long)hdd_ipa->stats.num_tx_bcmc_err); CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST CONTROL ====\n" "SAP NUM STAs: %d\n" diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index f1b02349696a..fb84e6634b4b 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -612,7 +612,7 @@ static bool wlan_sap_validate_channel_switch(tHalHandle hal, uint16_t sap_ch, ptSapContext sap_context) { return sme_validate_sap_channel_switch( - hHal, + hal, sap_ch, sap_context->csr_roamProfile.phyMode, sap_context->cc_switch_mode, diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index a116307655d0..743f3cc01a93 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -704,7 +704,7 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, CDF_SAP_MODE)) && (session->connectState != eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED)) { - if (pSession->ch_switch_in_progress) + if (session->ch_switch_in_progress) continue; csr_handle_conc_chnl_overlap_for_sap_go(mac_ctx,