Blame SOURCES/0044-Revert-iwlwifi-mvm-remove-set-but-not-used-variable-.patch

deb259
From dc7e4b317630effc7dd55b714820c158db9addf5 Mon Sep 17 00:00:00 2001
deb259
From: Eugene Syromiatnikov <esyr@redhat.com>
deb259
Date: Thu, 5 Sep 2019 18:45:43 +0200
deb259
Subject: [PATCH 15/43] Revert "iwlwifi: mvm: remove set but not used variable
deb259
 'he_phy_data'"
deb259
deb259
This reverts commit 41c4588b06180aaa46dfc1a7d435befbbf269a93.
deb259
---
deb259
 drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 6 ++++++
deb259
 1 file changed, 6 insertions(+)
deb259
deb259
Index: src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
deb259
===================================================================
deb259
--- src.orig/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c	2019-09-06 01:25:42.865325621 +0200
deb259
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c	2019-09-06 01:25:43.040323389 +0200
deb259
@@ -1464,6 +1464,12 @@
deb259
 	/* update aggregation data for monitor sake on default queue */
deb259
 	if (!queue && (phy_info & IWL_RX_MPDU_PHY_AMPDU)) {
deb259
 		bool toggle_bit = phy_info & IWL_RX_MPDU_PHY_AMPDU_TOGGLE;
deb259
+		u64 he_phy_data;
deb259
+
deb259
+		if (mvm->trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560)
deb259
+			he_phy_data = le64_to_cpu(desc->v3.he_phy_data);
deb259
+		else
deb259
+			he_phy_data = le64_to_cpu(desc->v1.he_phy_data);
deb259
 
deb259
 		rx_status->flag |= RX_FLAG_AMPDU_DETAILS;
deb259
 		/*