qcacld-3.0: Replace SIR_MAC_SA_QUERY_* with converged enum

Replace SIR_MAC_SA_QUERY_* with converged enum.

Change-Id: If5d2b4edfa2719bb19f94dad1557a3c64772da0b
CRs-Fixed: 2471272
This commit is contained in:
Srinivas Girigowda
2019-06-13 11:12:29 -07:00
committed by nshrivas
parent e5cc0e917b
commit feb23fc3f0
3 changed files with 4 additions and 10 deletions

View File

@@ -159,12 +159,6 @@
#define SIR_MAC_ACTION_GAS_COMEBACK_REQUEST 0x0C
#define SIR_MAC_ACTION_GAS_COMEBACK_RESPONSE 0x0D
#ifdef WLAN_FEATURE_11W
/* 11w SA query request/response action frame category code */
#define SIR_MAC_SA_QUERY_REQ 0
#define SIR_MAC_SA_QUERY_RSP 1
#endif
/* WNM Action field values; IEEE Std 802.11-2012, 8.5.14.1, Table 8-250 */
#define SIR_MAC_WNM_BSS_TM_QUERY 6
#define SIR_MAC_WNM_BSS_TM_REQUEST 7

View File

@@ -2103,14 +2103,14 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
pe_debug("SA Query Action category: %d action: %d",
action_hdr->category, action_hdr->actionID);
switch (action_hdr->actionID) {
case SIR_MAC_SA_QUERY_REQ:
case SA_QUERY_REQUEST:
/**11w SA query request action frame received**/
/* Respond directly to the incoming request in LIM */
__lim_process_sa_query_request_action_frame(mac_ctx,
(uint8_t *)rx_pkt_info,
session);
break;
case SIR_MAC_SA_QUERY_RSP:
case SA_QUERY_RESPONSE:
/**11w SA query response action frame received**/
/* Handle based on the current SA Query state */
__lim_process_sa_query_response_action_frame(mac_ctx,

View File

@@ -4417,7 +4417,7 @@ QDF_STATUS lim_send_sa_query_request_frame(struct mac_context *mac, uint8_t *tra
/* 11w action field is :
action: 0 --> SA Query Request action frame
action: 1 --> SA Query Response action frame */
frm.Action.action = SIR_MAC_SA_QUERY_REQ;
frm.Action.action = SA_QUERY_REQUEST;
/* 11w SA Query Request transId */
qdf_mem_copy(&frm.TransactionId.transId[0], &transId[0], 2);
@@ -4549,7 +4549,7 @@ QDF_STATUS lim_send_sa_query_response_frame(struct mac_context *mac,
/*11w action field is :
action: 0 --> SA query request action frame
action: 1 --> SA query response action frame */
frm.Action.action = SIR_MAC_SA_QUERY_RSP;
frm.Action.action = SA_QUERY_RESPONSE;
/*11w SA query response transId is same as
SA query request transId */
qdf_mem_copy(&frm.TransactionId.transId[0], &transId[0], 2);