diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-13 14:43:02 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-13 14:43:02 -0500 |
| commit | 0e028ab0fb2da47fd235dafd4159859892e73d08 (patch) | |
| tree | e9e1348372b413e6b1b503209582b03c9005f614 /drivers/net/wireless/iwlwifi/mvm/utils.c | |
| parent | e57f1734d87aa0e9a00905ed08888f0c62f56227 (diff) | |
| parent | 348f7d4adee97f222e3ad9ff97956ca3793d11c6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/utils.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c index f4598cb2dd2e..1493f79e67e0 100644 --- a/drivers/net/wireless/iwlwifi/mvm/utils.c +++ b/drivers/net/wireless/iwlwifi/mvm/utils.c | |||
| @@ -469,6 +469,8 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm) | |||
| 469 | mvm->status, table.valid); | 469 | mvm->status, table.valid); |
| 470 | } | 470 | } |
| 471 | 471 | ||
| 472 | IWL_ERR(mvm, "Loaded firmware version: %s\n", mvm->fw->fw_version); | ||
| 473 | |||
| 472 | trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low, | 474 | trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low, |
| 473 | table.data1, table.data2, table.data3, | 475 | table.data1, table.data2, table.data3, |
| 474 | table.blink1, table.blink2, table.ilink1, | 476 | table.blink1, table.blink2, table.ilink1, |