diff options
| author | Kiran Kumar Lokere <klokere@qca.qualcomm.com> | 2014-11-14 12:28:03 -0800 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-11-15 00:01:24 -0800 |
| commit | e1da62f4a24b97f11ddad4bbb00535e1e10fca45 (patch) | |
| tree | b361e13332dd9c26cf0ea4b81c64e6927675e290 /CORE/SAP/src/sapModule.c | |
| parent | a821f01a457239ad8dfc90c52ca00b1edbc897db (diff) | |
Revert "qcacld: Fix to select CB mode based on phymode/channel/vhtchannelwidth"
This reverts change-id Ib9c965d45fb5019d22957cda07a28da27f6ccb7f .
Change-Id: Icba57e738a66c5fc18641c4ede5e19b59e075f30
CRs-Fixed: 755604
Diffstat (limited to 'CORE/SAP/src/sapModule.c')
| -rw-r--r-- | CORE/SAP/src/sapModule.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c index 5b33236d0ebe..c8ce37759320 100644 --- a/CORE/SAP/src/sapModule.c +++ b/CORE/SAP/src/sapModule.c @@ -2828,10 +2828,6 @@ WLANSAP_ChannelChangeRequest(v_PVOID_t pSapCtx, tANI_U8 tArgetChannel) ptSapContext sapContext = NULL; eHalStatus halStatus = eHAL_STATUS_FAILURE; v_PVOID_t hHal = NULL; - tpAniSirGlobal pMac = NULL; - eCsrPhyMode phyMode; - tANI_U32 cbMode; - tANI_U32 vhtChannelWidth; sapContext = (ptSapContext)pSapCtx; if ( NULL == sapContext ) @@ -2848,19 +2844,10 @@ WLANSAP_ChannelChangeRequest(v_PVOID_t pSapCtx, tANI_U8 tArgetChannel) "%s: Invalid HAL pointer from pvosGCtx", __func__); return VOS_STATUS_E_FAULT; } - pMac = PMAC_STRUCT( hHal ); - phyMode = - sapConvertSapPhyModeToCsrPhyMode(sapContext->csrRoamProfile.phyMode); - /* - * We are getting channel bonding mode from sapDfsInfor structure - * because we've implemented channel width fallback mechanism for DFS - * which will result in channel width changing dynamically. - */ - cbMode = pMac->sap.SapDfsInfo.new_cbMode; - vhtChannelWidth = pMac->sap.SapDfsInfo.new_chanWidth; - halStatus = sme_RoamChannelChangeReq(hHal, sapContext->bssid, - tArgetChannel, - phyMode, cbMode, vhtChannelWidth); + + halStatus = sme_RoamChannelChangeReq( hHal, sapContext->bssid, + tArgetChannel, + sapConvertSapPhyModeToCsrPhyMode(sapContext->csrRoamProfile.phyMode) ); if (halStatus == eHAL_STATUS_SUCCESS) { |