Merge "qcacld-3.0: Use preauth channel to fetch the band during roaming" into wlan-cld3.driver.lnx.1.1-dev

This commit is contained in:
Service qcabuildsw 2016-09-20 17:45:10 -07:00 • committed by Gerrit - the friendly Code Review server
commit d9be4bba04
2 changed files with 17 additions and 13 deletions

View file

@ -407,12 +407,16 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
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)) {
if ((NULL != pe_session->ftPEContext.pFTPreAuthReq) &&
(SIR_BAND_5_GHZ == lim_get_rf_band(
pe_session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
else 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);

View file

@ -2265,15 +2265,15 @@ alloc_packet:
}
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 == 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->
preAuthchannelNum))))
if ((NULL != session->ftPEContext.pFTPreAuthReq) &&
(SIR_BAND_5_GHZ == lim_get_rf_band(
session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
else if ((SIR_BAND_5_GHZ ==
lim_get_rf_band(session->currentOperChannel))
|| (session->pePersona == QDF_P2P_CLIENT_MODE)
|| (session->pePersona == QDF_P2P_GO_MODE))
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
if (session->pePersona == QDF_P2P_CLIENT_MODE ||
session->pePersona == QDF_STA_MODE)