qcacld-3.0: Update group mgmt cipher suite in RSO commands

Newly introduced WMI macro for group management cipher suite is:
WMI_CIPHER_BIP_GMAC_256 0xf

Currently, host updates the localy defined macro for group
management cipher suite to the firmware only as part of RSO
commands over the WMI_AP_PROFILE command. Host should update
group management cipher suite as per WMI cipher macro.

Fix is to update the group management cipher suite in RSO cmd
as per WMI cipher macro.

Change-Id: I81dc5e800c55d1eb6cd0447265205d3413b29177
CRs-Fixed: 2547507

core/wma/src/wma_mgmt.c

@@ -2049,7 +2049,8 @@ static inline void wma_fill_in_wapi_key_params(
 static bool
 wma_skip_bip_key_set(tp_wma_handle wma_handle, uint32_t key_cipher)
 {
-	if ((key_cipher == WMI_CIPHER_AES_GMAC) &&
+	if ((key_cipher == WMI_CIPHER_AES_GMAC ||
+	     key_cipher == WMI_CIPHER_BIP_GMAC_256) &&
 	    !wmi_service_enabled(wma_handle->wmi_handle,
 				 wmi_service_gmac_offload_support))
 		return true;
@@ -3896,7 +3897,8 @@ int wma_process_bip(tp_wma_handle wma_handle,
 
 	if (iface->key.key_cipher == WMI_CIPHER_AES_CMAC) {
 		mmie_size = cds_get_mmie_size();
-	} else if (iface->key.key_cipher == WMI_CIPHER_AES_GMAC) {
+	} else if (iface->key.key_cipher == WMI_CIPHER_AES_GMAC ||
+		   iface->key.key_cipher == WMI_CIPHER_BIP_GMAC_256) {
 		mmie_size = cds_get_gmac_mmie_size();
 	} else {
 		WMA_LOGE(FL("Invalid key cipher %d"), iface->key.key_cipher);
@@ -3945,6 +3947,7 @@ int wma_process_bip(tp_wma_handle wma_handle,
 		break;
 
 	case WMI_CIPHER_AES_GMAC:
+	case WMI_CIPHER_BIP_GMAC_256:
 		if (wmi_service_enabled(wma_handle->wmi_handle,
 				wmi_service_gmac_offload_support)) {
 			/*

core/wma/src/wma_scan_roam.c

@@ -874,13 +874,6 @@ A_UINT32 e_csr_encryption_type_to_rsn_cipherset(eCsrEncryptionType encr)
 	}
 }
 
-/* ToDo: Replace this with WMI inteface enum nce the
- * interface changes are ready
- */
-#define CIPHER_BIP_CMAC_128 0xc
-#define CIPHER_BIP_GMAC_128 0xd
-#define CIPHER_BIP_GMAC_256 0xe
-
 /**
  * wma_convert_gp_mgmt_cipher_to_target_cipher_type() - map csr ani group mgmt
  * enc type to RSN cipher
@@ -896,16 +889,15 @@ wma_convert_gp_mgmt_cipher_to_target_cipher_type(tAniEdType cipher_type)
 	switch (cipher_type) {
 	/* BIP-CMAC-128 (00:0f:ac: 0x06) */
 	case eSIR_ED_AES_128_CMAC:
-		return CIPHER_BIP_CMAC_128;
+		return WMI_CIPHER_AES_CMAC;
 
 	/* BIP-GMAC-128 (00:0f:ac: 0x0b) */
 	case eSIR_ED_AES_GMAC_128:
-		return CIPHER_BIP_GMAC_128;
+		return WMI_CIPHER_AES_GMAC;
 
 	/* BIP-GMAC-256(00:0f:ac: 0x0c)*/
 	case eSIR_ED_AES_GMAC_256:
-		return CIPHER_BIP_GMAC_256;
-
+		return WMI_CIPHER_BIP_GMAC_256;
 	case eSIR_ED_NONE:
 	default:
 		return WMI_CIPHER_NONE;