qcacld-3.0: Replace SIR_MAC_ACTION_* macros with ACTION_CATEGORY_*

Replace SIR_MAC_ACTION_* macros with converged ACTION_CATEGORY_*.

Change-Id: I53eb7f02ca9e271116198d40b0e98163cc0331b8
CRs-Fixed: 2457795

core/mac/inc/sir_mac_prot_def.h

@@ -100,29 +100,6 @@
 #define SIR_MAC_MGMT_ACTION       0xD
 #define SIR_MAC_MGMT_RESERVED15   0xF
 
-/* Action frame categories */
-
-#define SIR_MAC_ACTION_SPECTRUM_MGMT   0
-#define SIR_MAC_ACTION_QOS_MGMT        1
-#define SIR_MAC_ACTION_DLP             2
-#define SIR_MAC_ACTION_BLKACK          3
-#define SIR_MAC_ACTION_PUBLIC_USAGE    4
-#define SIR_MAC_ACTION_RRM             5
-#define SIR_MAC_ACTION_FAST_BSS_TRNST  6
-#define SIR_MAC_ACTION_HT              7
-#define SIR_MAC_ACTION_SA_QUERY        8
-#define SIR_MAC_ACTION_PROT_DUAL_PUB   9
-#define SIR_MAC_ACTION_WNM            10
-#define SIR_MAC_ACTION_UNPROT_WNM     11
-#define SIR_MAC_ACTION_TDLS           12
-#define SIR_MAC_ACITON_MESH           13
-#define SIR_MAC_ACTION_MHF            14
-#define SIR_MAC_SELF_PROTECTED        15
-#define SIR_MAC_ACTION_WME            17
-#define SIR_MAC_ACTION_FST            18
-#define SIR_MAC_ACTION_VHT            21
-#define SIR_MAC_ACTION_MAX            256
-
 #define SIR_MAC_ACTION_TX             1
 #define SIR_MAC_ACTION_RX             2
 

core/mac/src/pe/lim/lim_process_action_frame.c

@@ -1807,7 +1807,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 #endif
 
 	switch (action_hdr->category) {
-	case SIR_MAC_ACTION_QOS_MGMT:
+	case ACTION_CATEGORY_QOS:
 		if ((session->limQosEnabled) ||
 		    (action_hdr->actionID == SIR_MAC_QOS_MAP_CONFIGURE)) {
 			switch (action_hdr->actionID) {
@@ -1843,7 +1843,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 		}
 		break;
 
-	case SIR_MAC_ACTION_SPECTRUM_MGMT:
+	case ACTION_CATEGORY_SPECTRUM_MGMT:
 		switch (action_hdr->actionID) {
 #ifdef ANI_SUPPORT_11H
 		case SIR_MAC_ACTION_MEASURE_REQUEST_ID:
@@ -1872,7 +1872,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 		}
 		break;
 
-	case SIR_MAC_ACTION_WME:
+	case ACTION_CATEGORY_WMM:
 		if (!session->limWmeEnabled) {
 			pe_warn("WME mode disabled - dropping frame: %d",
 				action_hdr->actionID);
@@ -1906,7 +1906,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 		}
 		break;
 
-	case SIR_MAC_ACTION_HT:
+	case ACTION_CATEGORY_HT:
 		/** Type of HT Action to be performed*/
 		switch (action_hdr->actionID) {
 		case SIR_MAC_SM_POWER_SAVE:
@@ -1922,7 +1922,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 		}
 		break;
 
-	case SIR_MAC_ACTION_WNM:
+	case ACTION_CATEGORY_WNM:
 		pe_debug("WNM Action category: %d action: %d",
 			action_hdr->category, action_hdr->actionID);
 		switch (action_hdr->actionID) {
@@ -1949,7 +1949,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 		}
 		break;
 
-	case SIR_MAC_ACTION_RRM:
+	case ACTION_CATEGORY_RRM:
 		/* Ignore RRM measurement request until DHCP is set */
 		if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
 		    mac_ctx->roam.roamSession
@@ -2044,7 +2044,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 				GET_LIM_SYSTEM_ROLE(session));
 		}
 	break;
-	case SIR_MAC_ACTION_PUBLIC_USAGE:
+	case ACTION_CATEGORY_PUBLIC:
 		mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
 
 		switch (action_hdr->actionID) {
@@ -2099,7 +2099,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 		break;
 
 #ifdef WLAN_FEATURE_11W
-	case SIR_MAC_ACTION_SA_QUERY:
+	case ACTION_CATEGORY_SA_QUERY:
 		pe_debug("SA Query Action category: %d action: %d",
 			action_hdr->category, action_hdr->actionID);
 		switch (action_hdr->actionID) {
@@ -2122,7 +2122,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 		}
 		break;
 #endif
-	case SIR_MAC_ACTION_VHT:
+	case ACTION_CATEGORY_VHT:
 		if (!session->vhtCapability)
 			break;
 		switch (action_hdr->actionID) {
@@ -2140,7 +2140,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 			break;
 		}
 		break;
-	case SIR_MAC_ACTION_FST: {
+	case ACTION_CATEGORY_FST: {
 		tpSirMacMgmtHdr     hdr;
 
 		hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
@@ -2157,7 +2157,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 					    rx_pkt_info), RXMGMT_FLAG_NONE);
 		break;
 	}
-	case SIR_MAC_ACTION_PROT_DUAL_PUB:
+	case ACTION_CATEGORY_PROTECTED_DUAL_OF_PUBLIC_ACTION:
 		pe_debug("Rcvd Protected Dual of Public Action: %d",
 			action_hdr->actionID);
 		switch (action_hdr->actionID) {
@@ -2179,7 +2179,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 			break;
 		}
 		break;
-	case SIR_MAC_ACTION_BLKACK:
+	case ACTION_CATEGORY_BACK:
 		pe_debug("Rcvd Block Ack for %pM; action: %d",
 			session->selfMacAddr, action_hdr->actionID);
 		switch (action_hdr->actionID) {
@@ -2238,7 +2238,7 @@ void lim_process_action_frame_no_session(struct mac_context *mac, uint8_t *pBd)
 	}
 
 	switch (action_hdr->category) {
-	case SIR_MAC_ACTION_PUBLIC_USAGE:
+	case ACTION_CATEGORY_PUBLIC:
 		switch (action_hdr->actionID) {
 		case SIR_MAC_ACTION_VENDOR_SPECIFIC:
 			vendor_specific =

core/mac/src/pe/lim/lim_process_tdls.c

@@ -520,7 +520,7 @@ static QDF_STATUS lim_send_tdls_dis_req_frame(struct mac_context *mac,
 	/*
 	 * setup Fixed fields,
 	 */
-	tdlsDisReq.Category.category = SIR_MAC_ACTION_TDLS;
+	tdlsDisReq.Category.category = ACTION_CATEGORY_TDLS;
 	tdlsDisReq.Action.action = SIR_MAC_TDLS_DIS_REQ;
 	tdlsDisReq.DialogToken.token = dialog;
 
@@ -807,7 +807,7 @@ static QDF_STATUS lim_send_tdls_dis_rsp_frame(struct mac_context *mac,
 	/*
 	 * setup Fixed fields,
 	 */
-	tdlsDisRsp.Category.category = SIR_MAC_ACTION_PUBLIC_USAGE;
+	tdlsDisRsp.Category.category = ACTION_CATEGORY_PUBLIC;
 	tdlsDisRsp.Action.action = SIR_MAC_TDLS_DIS_RSP;
 	tdlsDisRsp.DialogToken.token = dialog;
 
@@ -1116,7 +1116,7 @@ QDF_STATUS lim_send_tdls_link_setup_req_frame(struct mac_context *mac,
 	smeSessionId = pe_session->smeSessionId;
 
 	qdf_mem_zero((uint8_t *) &tdlsSetupReq, sizeof(tDot11fTDLSSetupReq));
-	tdlsSetupReq.Category.category = SIR_MAC_ACTION_TDLS;
+	tdlsSetupReq.Category.category = ACTION_CATEGORY_TDLS;
 	tdlsSetupReq.Action.action = SIR_MAC_TDLS_SETUP_REQ;
 	tdlsSetupReq.DialogToken.token = dialog;
 
@@ -1375,7 +1375,7 @@ QDF_STATUS lim_send_tdls_teardown_frame(struct mac_context *mac,
 	 * serialization).  We start by zero-initializing the structure:
 	 */
 	qdf_mem_zero((uint8_t *) &teardown, sizeof(tDot11fTDLSTeardown));
-	teardown.Category.category = SIR_MAC_ACTION_TDLS;
+	teardown.Category.category = ACTION_CATEGORY_TDLS;
 	teardown.Action.action = SIR_MAC_TDLS_TEARDOWN;
 	teardown.Reason.code = reason;
 
@@ -1576,7 +1576,7 @@ static QDF_STATUS lim_send_tdls_setup_rsp_frame(struct mac_context *mac,
 	/*
 	 * setup Fixed fields,
 	 */
-	tdlsSetupRsp.Category.category = SIR_MAC_ACTION_TDLS;
+	tdlsSetupRsp.Category.category = ACTION_CATEGORY_TDLS;
 	tdlsSetupRsp.Action.action = SIR_MAC_TDLS_SETUP_RSP;
 	tdlsSetupRsp.DialogToken.token = dialog;
 
@@ -1824,7 +1824,7 @@ QDF_STATUS lim_send_tdls_link_setup_cnf_frame(struct mac_context *mac,
 	/*
 	 * setup Fixed fields,
 	 */
-	tdlsSetupCnf.Category.category = SIR_MAC_ACTION_TDLS;
+	tdlsSetupCnf.Category.category = ACTION_CATEGORY_TDLS;
 	tdlsSetupCnf.Action.action = SIR_MAC_TDLS_SETUP_CNF;
 	tdlsSetupCnf.DialogToken.token = dialog;
 
@@ -2831,7 +2831,7 @@ QDF_STATUS lim_process_sme_tdls_mgmt_send_req(struct mac_context *mac_ctx,
 		goto lim_tdls_send_mgmt_error;
 	}
 
-	cds_tdls_tx_rx_mgmt_event(SIR_MAC_ACTION_TDLS,
+	cds_tdls_tx_rx_mgmt_event(ACTION_CATEGORY_TDLS,
 		SIR_MAC_ACTION_TX, SIR_MAC_MGMT_ACTION,
 		send_req->req_type, send_req->peer_mac.bytes);
 

core/mac/src/pe/lim/lim_send_management_frames.c

@@ -841,7 +841,7 @@ lim_send_addts_req_action_frame(struct mac_context *mac,
 
 		AddTSReq.Action.action = SIR_MAC_QOS_ADD_TS_REQ;
 		AddTSReq.DialogToken.token = pAddTS->dialogToken;
-		AddTSReq.Category.category = SIR_MAC_ACTION_QOS_MGMT;
+		AddTSReq.Category.category = ACTION_CATEGORY_QOS;
 		if (pAddTS->lleTspecPresent) {
 			populate_dot11f_tspec(&pAddTS->tspec, &AddTSReq.TSPEC);
 		} else {
@@ -895,7 +895,7 @@ lim_send_addts_req_action_frame(struct mac_context *mac,
 
 		WMMAddTSReq.Action.action = SIR_MAC_QOS_ADD_TS_REQ;
 		WMMAddTSReq.DialogToken.token = pAddTS->dialogToken;
-		WMMAddTSReq.Category.category = SIR_MAC_ACTION_WME;
+		WMMAddTSReq.Category.category = ACTION_CATEGORY_WMM;
 
 		/* WMM spec 2.2.10 - status code is only filled in for ADDTS response */
 		WMMAddTSReq.StatusCode.statusCode = 0;
@@ -1403,7 +1403,7 @@ lim_send_delts_req_action_frame(struct mac_context *mac,
 	if (!wmmTspecPresent) {
 		qdf_mem_zero((uint8_t *) &DelTS, sizeof(DelTS));
 
-		DelTS.Category.category = SIR_MAC_ACTION_QOS_MGMT;
+		DelTS.Category.category = ACTION_CATEGORY_QOS;
 		DelTS.Action.action = SIR_MAC_QOS_DEL_TS_REQ;
 		populate_dot11f_ts_info(pTsinfo, &DelTS.TSInfo);
 
@@ -1420,7 +1420,7 @@ lim_send_delts_req_action_frame(struct mac_context *mac,
 	} else {
 		qdf_mem_zero((uint8_t *) &WMMDelTS, sizeof(WMMDelTS));
 
-		WMMDelTS.Category.category = SIR_MAC_ACTION_WME;
+		WMMDelTS.Category.category = ACTION_CATEGORY_WMM;
 		WMMDelTS.Action.action = SIR_MAC_QOS_DEL_TS_REQ;
 		WMMDelTS.DialogToken.token = 0;
 		WMMDelTS.StatusCode.statusCode = 0;
@@ -3319,7 +3319,7 @@ lim_send_meas_report_frame(struct mac_context *mac,
 
 	qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
 
-	frm.Category.category = SIR_MAC_ACTION_SPECTRUM_MGMT;
+	frm.Category.category = ACTION_CATEGORY_SPECTRUM_MGMT;
 	frm.Action.action = SIR_MAC_ACTION_MEASURE_REPORT_ID;
 	frm.DialogToken.token = pMeasReqFrame->actionHeader.dialogToken;
 
@@ -3445,7 +3445,7 @@ lim_send_tpc_report_frame(struct mac_context *mac,
 
 	qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
 
-	frm.Category.category = SIR_MAC_ACTION_SPECTRUM_MGMT;
+	frm.Category.category = ACTION_CATEGORY_SPECTRUM_MGMT;
 	frm.Action.action = SIR_MAC_ACTION_TPC_REPORT_ID;
 	frm.DialogToken.token = pTpcReqFrame->actionHeader.dialogToken;
 
@@ -3567,7 +3567,7 @@ lim_send_channel_switch_mgmt_frame(struct mac_context *mac,
 
 	qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
 
-	frm.Category.category = SIR_MAC_ACTION_SPECTRUM_MGMT;
+	frm.Category.category = ACTION_CATEGORY_SPECTRUM_MGMT;
 	frm.Action.action = SIR_MAC_ACTION_CHANNEL_SWITCH_ID;
 	frm.ChanSwitchAnn.switchMode = nMode;
 	frm.ChanSwitchAnn.newChannel = nNewChannel;
@@ -3687,7 +3687,7 @@ lim_send_extended_chan_switch_action_frame(struct mac_context *mac_ctx,
 
 	qdf_mem_zero(&frm, sizeof(frm));
 
-	frm.Category.category     = SIR_MAC_ACTION_PUBLIC_USAGE;
+	frm.Category.category     = ACTION_CATEGORY_PUBLIC;
 	frm.Action.action         = SIR_MAC_ACTION_EXT_CHANNEL_SWITCH_ID;
 
 	frm.ext_chan_switch_ann_action.switch_mode = mode;
@@ -3986,7 +3986,7 @@ lim_send_neighbor_report_request_frame(struct mac_context *mac,
 	smeSessionId = pe_session->smeSessionId;
 	qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
 
-	frm.Category.category = SIR_MAC_ACTION_RRM;
+	frm.Category.category = ACTION_CATEGORY_RRM;
 	frm.Action.action = SIR_MAC_RRM_NEIGHBOR_REQ;
 	frm.DialogToken.token = pNeighborReq->dialogToken;
 
@@ -4123,7 +4123,7 @@ lim_send_link_report_action_frame(struct mac_context *mac,
 
 	qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
 
-	frm.Category.category = SIR_MAC_ACTION_RRM;
+	frm.Category.category = ACTION_CATEGORY_RRM;
 	frm.Action.action = SIR_MAC_RRM_LINK_MEASUREMENT_RPT;
 	frm.DialogToken.token = pLinkReport->dialogToken;
 
@@ -4265,7 +4265,7 @@ lim_send_radio_measure_report_action_frame(struct mac_context *mac,
 	pe_debug("dialog_token %d num_report %d is_last_frame %d",
 		 dialog_token, num_report, is_last_frame);
 
-	frm->Category.category = SIR_MAC_ACTION_RRM;
+	frm->Category.category = ACTION_CATEGORY_RRM;
 	frm->Action.action = SIR_MAC_RRM_RADIO_MEASURE_RPT;
 	frm->DialogToken.token = dialog_token;
 
@@ -4440,7 +4440,7 @@ QDF_STATUS lim_send_sa_query_request_frame(struct mac_context *mac, uint8_t *tra
 	uint8_t smeSessionId = 0;
 
 	qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
-	frm.Category.category = SIR_MAC_ACTION_SA_QUERY;
+	frm.Category.category = ACTION_CATEGORY_SA_QUERY;
 	/* 11w action  field is :
 	   action: 0 --> SA Query Request action frame
 	   action: 1 --> SA Query Response action frame */
@@ -4572,7 +4572,7 @@ QDF_STATUS lim_send_sa_query_response_frame(struct mac_context *mac,
 	smeSessionId = pe_session->smeSessionId;
 
 	qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
-	frm.Category.category = SIR_MAC_ACTION_SA_QUERY;
+	frm.Category.category = ACTION_CATEGORY_SA_QUERY;
 	/*11w action  field is :
 	   action: 0 --> SA query request action frame
 	   action: 1 --> SA query response action frame */
@@ -4738,7 +4738,7 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx,
 
 	cdp_peer_release_ref(soc, peer, PEER_DEBUG_ID_LIM_SEND_ADDBA_RESP);
 	qdf_mem_zero((uint8_t *) &frm, sizeof(frm));
-	frm.Category.category = SIR_MAC_ACTION_BLKACK;
+	frm.Category.category = ACTION_CATEGORY_BACK;
 	frm.Action.action = SIR_MAC_ADDBA_RSP;
 
 	frm.DialogToken.token = dialog_token;

core/mac/src/pe/lim/lim_utils.c

@@ -6419,18 +6419,18 @@ bool lim_is_robust_mgmt_action_frame(uint8_t action_category)
 	 * is required then this function need few more arguments
 	 * and little change in logic.
 	 */
-	case SIR_MAC_ACTION_SPECTRUM_MGMT:
-	case SIR_MAC_ACTION_QOS_MGMT:
-	case SIR_MAC_ACTION_DLP:
-	case SIR_MAC_ACTION_BLKACK:
-	case SIR_MAC_ACTION_RRM:
-	case SIR_MAC_ACTION_FAST_BSS_TRNST:
-	case SIR_MAC_ACTION_SA_QUERY:
-	case SIR_MAC_ACTION_PROT_DUAL_PUB:
-	case SIR_MAC_ACTION_WNM:
-	case SIR_MAC_ACITON_MESH:
-	case SIR_MAC_ACTION_MHF:
-	case SIR_MAC_ACTION_FST:
+	case ACTION_CATEGORY_SPECTRUM_MGMT:
+	case ACTION_CATEGORY_QOS:
+	case ACTION_CATEGORY_DLS:
+	case ACTION_CATEGORY_BACK:
+	case ACTION_CATEGORY_RRM:
+	case ACTION_FAST_BSS_TRNST:
+	case ACTION_CATEGORY_SA_QUERY:
+	case ACTION_CATEGORY_PROTECTED_DUAL_OF_PUBLIC_ACTION:
+	case ACTION_CATEGORY_WNM:
+	case ACTION_CATEGORY_MESH_ACTION:
+	case ACTION_CATEGORY_MULTIHOP_ACTION:
+	case ACTION_CATEGORY_FST:
 		return true;
 	default:
 		pe_debug("non-PMF action category: %d", action_category);

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -4472,12 +4472,12 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac,
 
 	/* delegate to the framesc-generated code, */
 	switch (*pFrame) {
-	case SIR_MAC_ACTION_QOS_MGMT:
+	case ACTION_CATEGORY_QOS:
 		status =
 			dot11f_unpack_add_ts_response(mac, pFrame, nFrame,
 						      &addts, false);
 		break;
-	case SIR_MAC_ACTION_WME:
+	case ACTION_CATEGORY_WMM:
 		status =
 			dot11f_unpack_wmm_add_ts_response(mac, pFrame, nFrame,
 							  &wmmaddts, false);
@@ -4500,7 +4500,7 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac,
 	}
 	/* & "transliterate" from a 'tDot11fAddTSResponse' or a */
 	/* 'tDot11WMMAddTSResponse' to a 'tSirMacAddtsRspInfo'... */
-	if (SIR_MAC_ACTION_QOS_MGMT == *pFrame) {
+	if (ACTION_CATEGORY_QOS == *pFrame) {
 		pAddTs->dialogToken = addts.DialogToken.token;
 		pAddTs->status = (tSirMacStatusCodes) addts.Status.status;
 
@@ -4638,11 +4638,11 @@ sir_convert_delts_req2_struct(struct mac_context *mac,
 
 	/* delegate to the framesc-generated code, */
 	switch (*pFrame) {
-	case SIR_MAC_ACTION_QOS_MGMT:
+	case ACTION_CATEGORY_QOS:
 		status = dot11f_unpack_del_ts(mac, pFrame, nFrame,
 					      &delts, false);
 		break;
-	case SIR_MAC_ACTION_WME:
+	case ACTION_CATEGORY_WMM:
 		status = dot11f_unpack_wmm_del_ts(mac, pFrame, nFrame,
 						  &wmmdelts, false);
 		break;
@@ -4666,7 +4666,7 @@ sir_convert_delts_req2_struct(struct mac_context *mac,
 	}
 	/* & "transliterate" from a 'tDot11fDelTSResponse' or a */
 	/* 'tDot11WMMDelTSResponse' to a 'tSirMacDeltsReqInfo'... */
-	if (SIR_MAC_ACTION_QOS_MGMT == *pFrame) {
+	if (ACTION_CATEGORY_QOS == *pFrame) {
 		pDelTs->tsinfo.traffic.trafficType =
 			(uint16_t) delts.TSInfo.traffic_type;
 		pDelTs->tsinfo.traffic.tsid = (uint16_t) delts.TSInfo.tsid;