diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2016-04-20 19:45:05 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2016-04-20 20:00:24 +0300 |
| commit | 453173550256542c20b24a8d85b806941b77ac76 (patch) | |
| tree | 0a2cae532885db76f6ffd26c5b50f9bbff2b7451 /drivers/net/wireless/ath/ath10k/core.h | |
| parent | 7ebf721d0d47150f6e327a6ae2692779495a2c2a (diff) | |
| download | lwn-453173550256542c20b24a8d85b806941b77ac76.tar.gz lwn-453173550256542c20b24a8d85b806941b77ac76.zip | |
ath10k: move fw_version inside struct ath10k_fw_file
Preparation for testmode.c to use ath10k_core_fetch_board_data_api_n().
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/core.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/core.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index b377fd42c0a3..432b1590f6e6 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -630,6 +630,8 @@ enum ath10k_tx_pause_reason { struct ath10k_fw_file { const struct firmware *firmware; + char fw_version[ETHTOOL_FWVERS_LEN]; + const void *firmware_data; size_t firmware_len; @@ -893,7 +895,6 @@ struct ath10k { struct { /* protected by conf_mutex */ struct ath10k_fw_components utf_mode_fw; - char utf_version[32]; DECLARE_BITMAP(orig_fw_features, ATH10K_FW_FEATURE_COUNT); enum ath10k_fw_wmi_op_version orig_wmi_op_version; enum ath10k_fw_wmi_op_version op_version; |