]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
iwlwifi: mvm: don't dump log of second CPU when not relevant
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 11 Feb 2014 14:37:34 +0000 (16:37 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 13 Feb 2014 11:51:27 +0000 (13:51 +0200)
The new API for ALIVE notification was misunderstood.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/mvm/fw.c

index 4f398e63f44a31c3e8bdb24fe251c5dea8c99ae1..979b35bae056ef7ee485c4c5c1d3f9979a5efcd6 100644 (file)
@@ -130,7 +130,6 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
        } else {
                palive2 = (void *)pkt->data;
 
-               mvm->support_umac_log = true;
                mvm->error_event_table =
                        le32_to_cpu(palive2->error_event_table_ptr);
                mvm->log_event_table =
@@ -141,6 +140,9 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
 
                alive_data->valid = le16_to_cpu(palive2->status) ==
                                    IWL_ALIVE_STATUS_OK;
+               if (mvm->umac_error_event_table)
+                       mvm->support_umac_log = true;
+
                IWL_DEBUG_FW(mvm,
                             "Alive VER2 ucode status 0x%04x revision 0x%01X 0x%01X flags 0x%01X\n",
                             le16_to_cpu(palive2->status), palive2->ver_type,