qcacld-3.0: Replace SIR_MAC_WNM_* with converged macros WNM_BSS_*

Replace SIR_MAC_WNM_* with converged macros WNM_BSS_*.

Change-Id: I7866d87eac2da52df5fd537bacd5830c1af1784f
CRs-Fixed: 2472212

core/mac/inc/sir_mac_prot_def.h

@@ -159,13 +159,6 @@
 #define SIR_MAC_ACTION_GAS_COMEBACK_REQUEST     0x0C
 #define SIR_MAC_ACTION_GAS_COMEBACK_RESPONSE    0x0D
 
-/* 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
-#define SIR_MAC_WNM_BSS_TM_RESPONSE      8
-#define SIR_MAC_WNM_NOTIF_REQUEST        26
-#define SIR_MAC_WNM_NOTIF_RESPONSE       27
-
 /* Protected Dual of Public Action(PDPA) frames Action field */
 #define SIR_MAC_PDPA_GAS_INIT_REQ      10
 #define SIR_MAC_PDPA_GAS_INIT_RSP      11

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

@@ -1926,11 +1926,11 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 		pe_debug("WNM Action category: %d action: %d",
 			action_hdr->category, action_hdr->actionID);
 		switch (action_hdr->actionID) {
-		case SIR_MAC_WNM_BSS_TM_QUERY:
-		case SIR_MAC_WNM_BSS_TM_REQUEST:
-		case SIR_MAC_WNM_BSS_TM_RESPONSE:
-		case SIR_MAC_WNM_NOTIF_REQUEST:
-		case SIR_MAC_WNM_NOTIF_RESPONSE:
+		case WNM_BSS_TM_QUERY:
+		case WNM_BSS_TM_REQUEST:
+		case WNM_BSS_TM_RESPONSE:
+		case WNM_NOTIF_REQUEST:
+		case WNM_NOTIF_RESPONSE:
 			rssi = WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info);
 			mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
 			/* Forward to the SME to HDD to wpa_supplicant */