iwlwifi: pcie: update iwl_mpdu_desc fields

Final API of iwl_mpdu_desc has a change in the order of
the fields and does not include energy from the third
antenna (which is perfectly fine, since we don't have one).
Update the structure accordingly.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

2 files changed, 7 insertions, 10 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h
index b45c61e1f45c..df939f51d9b9 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h
@@ -347,11 +347,11 @@ struct iwl_rx_mpdu_desc {
         /* DW8 */
         __le32 filter_match;
         /* DW9 */
-        __le32 gp2_on_air_rise;
-        /* DW10 */
         __le32 rate_n_flags;
+        /* DW10 */
+        u8 energy_a, energy_b, channel, reserved;
         /* DW11 */
-        u8 energy_a, energy_b, energy_c, channel;
+        __le32 gp2_on_air_rise;
         /* DW12 & DW13 */
         __le64 tsf_on_air_rise;
 } __packed;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 4cce37238a08..615dea143d4e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -201,25 +201,22 @@ static void iwl_mvm_get_signal_strength(struct iwl_mvm *mvm,
                                         struct iwl_rx_mpdu_desc *desc,
                                         struct ieee80211_rx_status *rx_status)
 {
-        int energy_a, energy_b, energy_c, max_energy;
+        int energy_a, energy_b, max_energy;
 
         energy_a = desc->energy_a;
         energy_a = energy_a ? -energy_a : S8_MIN;
         energy_b = desc->energy_b;
         energy_b = energy_b ? -energy_b : S8_MIN;
-        energy_c = desc->energy_c;
-        energy_c = energy_c ? -energy_c : S8_MIN;
         max_energy = max(energy_a, energy_b);
-        max_energy = max(max_energy, energy_c);
 
-        IWL_DEBUG_STATS(mvm, "energy In A %d B %d C %d , and max %d\n",
-                        energy_a, energy_b, energy_c, max_energy);
+        IWL_DEBUG_STATS(mvm, "energy In A %d B %d, and max %d\n",
+                        energy_a, energy_b, max_energy);
 
         rx_status->signal = max_energy;
         rx_status->chains = 0; /* TODO: phy info */
         rx_status->chain_signal[0] = energy_a;
         rx_status->chain_signal[1] = energy_b;
-        rx_status->chain_signal[2] = energy_c;
+        rx_status->chain_signal[2] = S8_MIN;
 }
 
 static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr,