diff options
| author | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2015-02-13 22:57:21 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2015-02-13 22:58:53 +0530 |
| commit | ef268b67ea1b3ff43a8bcafd435b4605285ecdc9 (patch) | |
| tree | ef335fc5c236d9bde22aac0d21be46b54cfe5cc8 | |
| parent | f700757c9e73534fd1bfe3ce9658b7fbe57dbd65 (diff) | |
| parent | 8b59c837d7a2a726b338d36c6ead91e06983c623 (diff) | |
Release 4.0.10.34 QCACLD WLAN Driver
Merge remote-tracking branch 'origin/caf/caf-wlan/master' into HEAD
* origin/caf/caf-wlan/master:
Cafstaging Release 4.0.10.34
CLD: Logging improvement in Mcast/Bcast Filtering
BMI: Set maximum supported peers to 10 for high latency.
wlan:Clear the wmmAcSetupImplicitQos work in case of implicit AC mechanism
Change-Id: I07608986f64f9c8ef8e4e4c3a9300ba39f45c448
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_early_suspend.c | 14 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_wmm.c | 5 | ||||
| -rw-r--r-- | CORE/MAC/inc/qwlan_version.h | 4 | ||||
| -rw-r--r-- | CORE/SERVICES/BMI/ol_fw.c | 8 |
4 files changed, 22 insertions, 9 deletions
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c index 8be74e047da8..00e161b2c428 100644 --- a/CORE/HDD/src/wlan_hdd_early_suspend.c +++ b/CORE/HDD/src/wlan_hdd_early_suspend.c @@ -1223,10 +1223,20 @@ void hdd_conf_mcastbcast_filter(hdd_context_t* pHddCtx, v_BOOL_t setfilter) wlanRxpFilterParam->setMcstBcstFilter = setfilter; halStatus = sme_ConfigureRxpFilter(pHddCtx->hHal, wlanRxpFilterParam); + + if (setfilter && (eHAL_STATUS_SUCCESS == halStatus)) + pHddCtx->hdd_mcastbcast_filter_set = TRUE; + + hddLog(VOS_TRACE_LEVEL_INFO, "%s to post set/reset filter to" + "lower mac with status %d" + "configuredMcstBcstFilterSetting = %d" + "setMcstBcstFilter = %d",(eHAL_STATUS_SUCCESS != halStatus) ? + "Failed" : "Success", halStatus, + wlanRxpFilterParam->configuredMcstBcstFilterSetting, + wlanRxpFilterParam->setMcstBcstFilter); + if (eHAL_STATUS_SUCCESS != halStatus) vos_mem_free(wlanRxpFilterParam); - if(setfilter && (eHAL_STATUS_SUCCESS == halStatus)) - pHddCtx->hdd_mcastbcast_filter_set = TRUE; } static void hdd_conf_suspend_ind(hdd_context_t* pHddCtx, diff --git a/CORE/HDD/src/wlan_hdd_wmm.c b/CORE/HDD/src/wlan_hdd_wmm.c index 47e1f8c0cd9d..ce5dfc0869f9 100644 --- a/CORE/HDD/src/wlan_hdd_wmm.c +++ b/CORE/HDD/src/wlan_hdd_wmm.c @@ -1576,7 +1576,10 @@ VOS_STATUS hdd_wmm_adapter_close ( hdd_adapter_t* pAdapter ) #ifdef FEATURE_WLAN_ESE hdd_wmm_disable_inactivity_timer(pQosContext); #endif - vos_flush_work(&pQosContext->wmmAcSetupImplicitQos); + if (pQosContext->handle == HDD_WMM_HANDLE_IMPLICIT + && pQosContext->magic == HDD_WMM_CTX_MAGIC) + vos_flush_work(&pQosContext->wmmAcSetupImplicitQos); + hdd_wmm_free_context(pQosContext); } diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index 921abe3e1e02..33015868a292 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -42,9 +42,9 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 10 #define QWLAN_VERSION_EXTRA "" -#define QWLAN_VERSION_BUILD 33 +#define QWLAN_VERSION_BUILD 34 -#define QWLAN_VERSIONSTR "4.0.10.33" +#define QWLAN_VERSIONSTR "4.0.10.34" #define AR6320_REV1_VERSION 0x5000000 diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c index 4aa0bb9631b4..f70f3237dd72 100644 --- a/CORE/SERVICES/BMI/ol_fw.c +++ b/CORE/SERVICES/BMI/ol_fw.c @@ -2355,10 +2355,10 @@ int ol_target_coredump(void *inst, void *memoryBlock, u_int32_t blockLength) #if defined(CONFIG_HL_SUPPORT) #define MAX_SUPPORTED_PEERS_REV1_1 9 -#define MAX_SUPPORTED_PEERS_REV1_3 9 +#define MAX_SUPPORTED_PEERS 10 #else #define MAX_SUPPORTED_PEERS_REV1_1 14 -#define MAX_SUPPORTED_PEERS_REV1_3 32 +#define MAX_SUPPORTED_PEERS 32 #endif u_int8_t ol_get_number_of_peers_supported(struct ol_softc *scn) @@ -2374,8 +2374,8 @@ u_int8_t ol_get_number_of_peers_supported(struct ol_softc *scn) break; default: - if(scn->max_no_of_peers > MAX_SUPPORTED_PEERS_REV1_3) - max_no_of_peers = MAX_SUPPORTED_PEERS_REV1_3; + if(scn->max_no_of_peers > MAX_SUPPORTED_PEERS) + max_no_of_peers = MAX_SUPPORTED_PEERS; else max_no_of_peers = scn->max_no_of_peers; break; |