qcacld-3.0: Use converged cmd types for STA and SAP

For STA connect/disconnect, SAP start/stop relative cmds, just
use following serialization command types:
Converged cmd types:
	WLAN_SER_CMD_VDEV_START_BSS
	WLAN_SER_CMD_VDEV_STOP_BSS
	WLAN_SER_CMD_VDEV_CONNECT
	WLAN_SER_CMD_VDEV_DISCONNECT
	WLAN_SER_CMD_VDEV_RESTART

Change-Id: I533f650e1f69048d6861751ab74f75d8d5f18c83
CRs-Fixed: 2318545
This commit is contained in:
Jianmin Zhu 2018-11-29 19:35:56 +08:00 • committed by nshrivas
commit d0ab26143d

View file

@ -19774,13 +19774,18 @@ static enum wlan_serialization_cmd_type csr_get_roam_cmd_type(
switch (sme_cmd->u.roamCmd.roamReason) {
case eCsrForcedDisassoc:
cmd_type = WLAN_SER_CMD_FORCE_DISASSOC;
case eCsrForcedDeauth:
case eCsrForcedDisassocMICFailure:
cmd_type = WLAN_SER_CMD_VDEV_DISCONNECT;
break;
case eCsrHddIssued:
cmd_type = WLAN_SER_CMD_HDD_ISSUED;
break;
case eCsrForcedDisassocMICFailure:
cmd_type = WLAN_SER_CMD_FORCE_DISASSOC_MIC_FAIL;
if (csr_is_bss_type_ibss(
sme_cmd->u.roamCmd.roamProfile.BSSType) ||
CSR_IS_INFRA_AP(&sme_cmd->u.roamCmd.roamProfile) ||
CSR_IS_NDI(&sme_cmd->u.roamCmd.roamProfile))
cmd_type = WLAN_SER_CMD_VDEV_START_BSS;
else
cmd_type = WLAN_SER_CMD_VDEV_CONNECT;
break;
case eCsrHddIssuedReassocToSameAP:
cmd_type = WLAN_SER_CMD_HDD_ISSUE_REASSOC_SAME_AP;
@ -19788,9 +19793,6 @@ static enum wlan_serialization_cmd_type csr_get_roam_cmd_type(
case eCsrSmeIssuedReassocToSameAP:
cmd_type = WLAN_SER_CMD_SME_ISSUE_REASSOC_SAME_AP;
break;
case eCsrForcedDeauth:
cmd_type = WLAN_SER_CMD_FORCE_DEAUTH;
break;
case eCsrSmeIssuedDisassocForHandoff:
cmd_type =
WLAN_SER_CMD_SME_ISSUE_DISASSOC_FOR_HANDOFF;
@ -19918,8 +19920,7 @@ QDF_STATUS csr_set_serialization_params_to_cmd(tpAniSirGlobal mac_ctx,
* is set to 10 seconds. For all other commands its 30 seconds
*/
if ((cmd->vdev->vdev_mlme.vdev_opmode == QDF_SAP_MODE) &&
((cmd->cmd_type == WLAN_SER_CMD_HDD_ISSUED) ||
(cmd->cmd_type == WLAN_SER_CMD_VDEV_STOP_BSS)))
(cmd->cmd_type == WLAN_SER_CMD_VDEV_STOP_BSS))
cmd->cmd_timeout_duration = SME_START_STOP_BSS_CMD_TIMEOUT;
else if (cmd->cmd_type == WLAN_SER_CMD_DEL_STA_SESSION)
cmd->cmd_timeout_duration = SME_VDEV_DELETE_CMD_TIMEOUT;