diff options
| author | Akash Patel <akashp@codeaurora.org> | 2014-03-21 11:41:45 -0700 |
|---|---|---|
| committer | Akash Patel <akashp@codeaurora.org> | 2014-03-21 11:44:40 -0700 |
| commit | 263c71c065d6280cc7ee43375ec0036e74ec1fad (patch) | |
| tree | 5621a79239887ba8e04ec4c338b1139b3238f93d /CORE/SAP/src/sapModule.c | |
| parent | 212b1a05a4932b10dabc2c82cb739074b9d444a9 (diff) | |
| parent | 1a03a75c1ef04bb27fa96c0381ed0d394f78b0d5 (diff) | |
Release 1.0.0.66,67 & 68 QCACLD WLAN Driver
Merge remote-tracking branch 'origin/caf/caf-wlan/master'
* origin/caf/caf-wlan/master: (26 commits)
Cafstaging Release 1.0.0.68
wlan: fix unsafe code after VOS_ASSERT
qcacld: TxRx: Reduce CPU cycles for ol_tx_desc_ll() in Tx path.
qcacld: hdd: HS2.0 gratuitous ARP/unsolicited NA dropping
Cafstaging Release 1.0.0.67
qcacld: Allow PTK to be set prior to reassociation in 11r
qcacld: hdd: Return proper value in PMKSA call back
qcacl/wma: Extend packet trace for management action frames
qcacld: utils: reduce debug print level for fwlog drop
qcacld: Reduce log levels of tspec operations in roaming
qcacld: Adding thermal throttle level set command for SAP
LIM: Do not free pDelBss in limHandleDeleteBssRsp
qcacld: Fix Sessionid mismatch in DFS commands
clear unsafe channel cache at every fw reporting
qcacld: Abort data transmission immediately upon disassociation
qcacld : Division by zero in kernel
qcacld: Fix for un-initialized pointer
cnss: Fix x86_64 compilation error
qcacld: hdd: Do not downgrade if we have valid Tspec
Cafstaging Release 1.0.0.66
...
Change-Id: I277ea31ec0a467863dfa60bd0d94b008e9514dd0
Diffstat (limited to 'CORE/SAP/src/sapModule.c')
| -rw-r--r-- | CORE/SAP/src/sapModule.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c index 440ec1485146..87ac5ac99663 100644 --- a/CORE/SAP/src/sapModule.c +++ b/CORE/SAP/src/sapModule.c @@ -2429,8 +2429,9 @@ WLANSAP_ChannelChangeRequest(v_PVOID_t pSapCtx, tANI_U8 tArgetChannel) return VOS_STATUS_E_FAULT; } - halStatus = sme_RoamChannelChangeReq( hHal, sapContext->sessionId, tArgetChannel, - sapConvertSapPhyModeToCsrPhyMode(sapContext->csrRoamProfile.phyMode)); + halStatus = sme_RoamChannelChangeReq( hHal, sapContext->bssid, + tArgetChannel, + sapConvertSapPhyModeToCsrPhyMode(sapContext->csrRoamProfile.phyMode) ); if (halStatus == eHAL_STATUS_SUCCESS) { @@ -2495,7 +2496,7 @@ VOS_STATUS WLANSAP_StartBeaconReq(v_PVOID_t pSapCtx) /* CAC Wait done without any Radar Detection */ dfsCacWaitStatus = VOS_TRUE; halStatus = sme_RoamStartBeaconReq( hHal, - sapContext->sessionId, dfsCacWaitStatus); + sapContext->bssid, dfsCacWaitStatus); if (halStatus == eHAL_STATUS_SUCCESS) { return VOS_STATUS_SUCCESS; @@ -2549,9 +2550,11 @@ WLANSAP_DfsSendCSAIeRequest(v_PVOID_t pSapCtx) return VOS_STATUS_E_FAULT; } - halStatus = sme_RoamCsaIeRequest(hHal, sapContext->sessionId, + halStatus = sme_RoamCsaIeRequest(hHal, + sapContext->bssid, sapContext->SapDfsInfo.target_channel, sapContext->SapDfsInfo.csaIERequired); + if (halStatus == eHAL_STATUS_SUCCESS) { return VOS_STATUS_SUCCESS; |