Prechádzať zdrojové kódy

qcacld-3.0: Remove useless legacy roam reason eSmeIssuedIbssJoinFailure

Remove all eSmeIssuedIbssJoinFailure relative code in disasssoc
and roam result handler.

Change-Id: Ia204fa331ec6f5de1ff52b8c2d2907d10f0d1ee4
CRs-Fixed: 2308522
Jianmin Zhu 6 rokov pred
rodič
commit
1ad0dadd83

+ 0 - 1
core/sme/inc/csr_api.h

@@ -597,7 +597,6 @@ typedef enum {
 	eCSR_DISCONNECT_REASON_DISASSOC,
 	eCSR_DISCONNECT_REASON_DEAUTH,
 	eCSR_DISCONNECT_REASON_HANDOFF,
-	eCSR_DISCONNECT_REASON_IBSS_JOIN_FAILURE,
 	eCSR_DISCONNECT_REASON_IBSS_LEAVE,
 	eCSR_DISCONNECT_REASON_STA_HAS_LEFT,
 	eCSR_DISCONNECT_REASON_NDI_DELETE,

+ 0 - 2
core/sme/inc/csr_internal.h

@@ -132,8 +132,6 @@ enum csr_roam_reason {
 	eCsrSmeIssuedDisassocForHandoff,
 	/* will be issued by Handoff logic to join a new AP with same profile */
 	eCsrSmeIssuedAssocToSimilarAP,
-	/* ibss jointimer fired before any peer showedup, so shutdown network */
-	eCsrSmeIssuedIbssJoinFailure,
 	eCsrForcedIbssLeave,
 	eCsrStopBss,
 	eCsrSmeIssuedFTReassoc,

+ 4 - 18
core/sme/src/csr/csr_api_roam.c

@@ -7261,19 +7261,12 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx,
 		break;
 	case eCsrForcedDisassoc:
 	case eCsrForcedDeauth:
-	case eCsrSmeIssuedIbssJoinFailure:
 		csr_roam_state_change(mac_ctx, eCSR_ROAMING_STATE_IDLE,
 			session_id);
-
-		if (eCsrSmeIssuedIbssJoinFailure == cmd->u.roamCmd.roamReason)
-			/* notify HDD that IBSS join failed */
-			csr_roam_call_callback(mac_ctx, session_id, NULL, 0,
-				eCSR_ROAM_IBSS_IND,
-				eCSR_ROAM_RESULT_IBSS_JOIN_FAILED);
-		else
-			csr_roam_call_callback(mac_ctx, session_id, NULL,
-				cmd->u.roamCmd.roamId, eCSR_ROAM_DISASSOCIATED,
-				eCSR_ROAM_RESULT_FORCED);
+		csr_roam_call_callback(
+			mac_ctx, session_id, NULL,
+			cmd->u.roamCmd.roamId, eCSR_ROAM_DISASSOCIATED,
+			eCSR_ROAM_RESULT_FORCED);
 #ifndef WLAN_MDM_CODE_REDUCTION_OPT
 		sme_qos_csr_event_ind(mac_ctx, (uint8_t) session_id,
 				SME_QOS_CSR_DISCONNECT_IND,
@@ -9426,10 +9419,6 @@ QDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac,
 		case eCSR_DISCONNECT_REASON_ROAM_HO_FAIL:
 			pCommand->u.roamCmd.roamReason = eCsrForcedDisassoc;
 			break;
-		case eCSR_DISCONNECT_REASON_IBSS_JOIN_FAILURE:
-			pCommand->u.roamCmd.roamReason =
-				eCsrSmeIssuedIbssJoinFailure;
-			break;
 		case eCSR_DISCONNECT_REASON_IBSS_LEAVE:
 			pCommand->u.roamCmd.roamReason = eCsrForcedIbssLeave;
 			break;
@@ -20526,9 +20515,6 @@ static enum wlan_serialization_cmd_type csr_get_roam_cmd_type(
 		cmd_type =
 			WLAN_SER_CMD_SME_ISSUE_ASSOC_TO_SIMILAR_AP;
 		break;
-	case eCsrSmeIssuedIbssJoinFailure:
-		cmd_type = WLAN_SER_CMD_SME_ISSUE_IBSS_JOIN_FAIL;
-		break;
 	case eCsrForcedIbssLeave:
 		cmd_type = WLAN_SER_CMD_FORCE_IBSS_LEAVE;
 		break;