diff --git a/[refs] b/[refs]
index 673a42cfe831..52804cdbf318 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dfa8d019cd21d08634ceb65a3fb90d0648bd93b
+refs/heads/master: 4db2c9aeb28762ea7416122d03a7e5c8d87eb924
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
index 54e09696fc9d..6f312c77af5e 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -636,14 +636,17 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
 		 case IWL_UCODE_TLV_SEC_RT:
 			iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_REGULAR,
 					    tlv_len);
+			drv->fw.mvm_fw = true;
 			break;
 		case IWL_UCODE_TLV_SEC_INIT:
 			iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_INIT,
 					    tlv_len);
+			drv->fw.mvm_fw = true;
 			break;
 		case IWL_UCODE_TLV_SEC_WOWLAN:
 			iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_WOWLAN,
 					    tlv_len);
+			drv->fw.mvm_fw = true;
 			break;
 		case IWL_UCODE_TLV_DEF_CALIB:
 			if (tlv_len != sizeof(struct iwl_tlv_calib_data))
@@ -870,7 +873,11 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
 		goto try_again;
 	}
 
-	if (validate_sec_sizes(drv, &pieces, cfg))
+	/*
+	 * In mvm uCode there is no difference between data and instructions
+	 * sections.
+	 */
+	if (!fw->mvm_fw && validate_sec_sizes(drv, &pieces, cfg))
 		goto try_again;
 
 	/* Allocate ucode buffers for card's bus-master loading ... */
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-fw.h b/trunk/drivers/net/wireless/iwlwifi/iwl-fw.h
index 5d634f3db929..8e36bdc1e522 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -170,6 +170,8 @@ struct iwl_fw {
 
 	u64 default_calib[IWL_UCODE_TYPE_MAX];
 	u32 phy_config;
+
+	bool mvm_fw;
 };
 
 #endif  /* __iwl_fw_h__ */