1 files changed, 14 insertions, 44 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
index 435eba0ed506..6d18a1fd649b 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
@@ -404,7 +404,7 @@ int iwl_nvm_init(struct iwl_mvm *mvm)
 	return ret < 0 ? ret : 0;
 }
 
-struct iwl_mcc_update_resp_v8 *
+struct iwl_mcc_update_resp *
 iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,
 		   enum iwl_mcc_source src_id)
 {
@@ -412,7 +412,7 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,
 		.mcc = cpu_to_le16(alpha2[0] << 8 | alpha2[1]),
 		.source_id = (u8)src_id,
 	};
-	struct iwl_mcc_update_resp_v8 *resp_cp;
+	struct iwl_mcc_update_resp *resp_cp;
 	struct iwl_rx_packet *pkt;
 	struct iwl_host_cmd cmd = {
 		.id = MCC_UPDATE_CMD,
@@ -420,7 +420,7 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,
 		.data = { &mcc_update_cmd },
 	};
 
-	int ret, resp_ver;
+	int ret;
 	u32 status;
 	int resp_len, n_channels;
 	u16 mcc;
@@ -439,55 +439,25 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,
 
 	pkt = cmd.resp_pkt;
 
-	resp_ver = iwl_fw_lookup_notif_ver(mvm->fw, IWL_ALWAYS_LONG_GROUP,
-					   MCC_UPDATE_CMD, 0);
-
 	/* Extract MCC response */
-	if (resp_ver >= 8) {
-		struct iwl_mcc_update_resp_v8 *mcc_resp_v8 = (void *)pkt->data;
-
-		n_channels =  __le32_to_cpu(mcc_resp_v8->n_channels);
-		resp_len = struct_size(resp_cp, channels, n_channels);
-		resp_cp = kzalloc(resp_len, GFP_KERNEL);
+	if (fw_has_capa(&mvm->fw->ucode_capa,
+			IWL_UCODE_TLV_CAPA_MCC_UPDATE_11AX_SUPPORT)) {
+		struct iwl_mcc_update_resp *mcc_resp = (void *)pkt->data;
+
+		n_channels =  __le32_to_cpu(mcc_resp->n_channels);
+		resp_len = sizeof(struct iwl_mcc_update_resp) +
+			   n_channels * sizeof(__le32);
+		resp_cp = kmemdup(mcc_resp, resp_len, GFP_KERNEL);
 		if (!resp_cp) {
 			resp_cp = ERR_PTR(-ENOMEM);
 			goto exit;
 		}
-		resp_cp->status = mcc_resp_v8->status;
-		resp_cp->mcc = mcc_resp_v8->mcc;
-		resp_cp->cap = mcc_resp_v8->cap;
-		resp_cp->source_id = mcc_resp_v8->source_id;
-		resp_cp->time = mcc_resp_v8->time;
-		resp_cp->geo_info = mcc_resp_v8->geo_info;
-		resp_cp->n_channels = mcc_resp_v8->n_channels;
-		memcpy(resp_cp->channels, mcc_resp_v8->channels,
-		       n_channels * sizeof(__le32));
-	} else if (fw_has_capa(&mvm->fw->ucode_capa,
-			       IWL_UCODE_TLV_CAPA_MCC_UPDATE_11AX_SUPPORT)) {
-		struct iwl_mcc_update_resp_v4 *mcc_resp_v4 = (void *)pkt->data;
-
-		n_channels =  __le32_to_cpu(mcc_resp_v4->n_channels);
-		resp_len = struct_size(resp_cp, channels, n_channels);
-		resp_cp = kzalloc(resp_len, GFP_KERNEL);
-		if (!resp_cp) {
-			resp_cp = ERR_PTR(-ENOMEM);
-			goto exit;
-		}
-
-		resp_cp->status = mcc_resp_v4->status;
-		resp_cp->mcc = mcc_resp_v4->mcc;
-		resp_cp->cap = cpu_to_le32(le16_to_cpu(mcc_resp_v4->cap));
-		resp_cp->source_id = mcc_resp_v4->source_id;
-		resp_cp->time = mcc_resp_v4->time;
-		resp_cp->geo_info = mcc_resp_v4->geo_info;
-		resp_cp->n_channels = mcc_resp_v4->n_channels;
-		memcpy(resp_cp->channels, mcc_resp_v4->channels,
-		       n_channels * sizeof(__le32));
 	} else {
 		struct iwl_mcc_update_resp_v3 *mcc_resp_v3 = (void *)pkt->data;
 
 		n_channels =  __le32_to_cpu(mcc_resp_v3->n_channels);
-		resp_len = struct_size(resp_cp, channels, n_channels);
+		resp_len = sizeof(struct iwl_mcc_update_resp) +
+			   n_channels * sizeof(__le32);
 		resp_cp = kzalloc(resp_len, GFP_KERNEL);
 		if (!resp_cp) {
 			resp_cp = ERR_PTR(-ENOMEM);
@@ -496,7 +466,7 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,
 
 		resp_cp->status = mcc_resp_v3->status;
 		resp_cp->mcc = mcc_resp_v3->mcc;
-		resp_cp->cap = cpu_to_le32(mcc_resp_v3->cap);
+		resp_cp->cap = cpu_to_le16(mcc_resp_v3->cap);
 		resp_cp->source_id = mcc_resp_v3->source_id;
 		resp_cp->time = mcc_resp_v3->time;
 		resp_cp->geo_info = mcc_resp_v3->geo_info;