ath10k: move firmware_swap_code_seg_info to ath10k_fw_file

[cascardo/linux.git] / drivers / net / wireless / ath / ath10k / core.h

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 30ae5bf..cc6e66f 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -663,6 +663,15 @@ struct ath10k_fw_file {
 
        const void *codeswap_data;
        size_t codeswap_len;
+
+       /* The original idea of struct ath10k_fw_file was that it only
+        * contains struct firmware and pointers to various parts (actual
+        * firmware binary, otp, metadata etc) of the file. This seg_info
+        * is actually created separate but as this is used similarly as
+        * the other firmware components it's more convenient to have it
+        * here.
+        */
+       struct ath10k_swap_code_seg_info *firmware_swap_code_seg_info;
 };
 
 struct ath10k_fw_components {
@@ -774,10 +783,6 @@ struct ath10k {
        const struct firmware *pre_cal_file;
        const struct firmware *cal_file;
 
-       struct {
-               struct ath10k_swap_code_seg_info *firmware_swap_code_seg_info;
-       } swap;
-
        struct {
                u32 vendor;
                u32 device;