wifi: iwlwifi: mvm: refactor TX csum mode check

There are two modes now, and we have two places checking
that must be in sync. Refactor the logic into a new small
helper function.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230413102635.ef6246f4b73b.I44820ec095634dd0bba3007465cf25e4ce1c77c6@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 0ee5169de0349ad21392c1be7387bed1388d5c5f..fc15636beec0445b01c944576c75e56a8a4cc390 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -6129,10 +6129,7 @@ static bool iwl_mvm_mac_can_aggregate(struct ieee80211_hw *hw,
 {
        struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
 
-       if (mvm->trans->trans_cfg->device_family > IWL_DEVICE_FAMILY_BZ ||
-           (mvm->trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_BZ &&
-            !(CSR_HW_REV_TYPE(mvm->trans->hw_rev) == IWL_CFG_MAC_TYPE_GL &&
-              mvm->trans->hw_rev_step == SILICON_A_STEP)))
+       if (iwl_mvm_has_new_tx_csum(mvm))
                return iwl_mvm_tx_csum_bz(mvm, head, true) ==
                       iwl_mvm_tx_csum_bz(mvm, skb, true);
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index e32ce876951fcb991cfa6b92404b6ae57d71a759..76ac8a48071208ffc99e381d51d1b76281df57d0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1522,6 +1522,19 @@ static inline bool iwl_mvm_is_ctdp_supported(struct iwl_mvm *mvm)
                           IWL_UCODE_TLV_CAPA_CTDP_SUPPORT);
 }
 
+static inline bool iwl_mvm_has_new_tx_csum(struct iwl_mvm *mvm)
+{
+       if (mvm->trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_BZ)
+               return false;
+
+       if (mvm->trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_BZ &&
+           CSR_HW_REV_TYPE(mvm->trans->hw_rev) == IWL_CFG_MAC_TYPE_GL &&
+           mvm->trans->hw_rev_step <= SILICON_B_STEP)
+               return false;
+
+       return true;
+}
+
 extern const u8 iwl_mvm_ac_to_tx_fifo[];
 extern const u8 iwl_mvm_ac_to_gen2_tx_fifo[];
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index b3545c3273e59c6255d94ee2fc58b5c6ca391a07..51f21cbf7a20b4070f01101efc069f7ba3a2e1ca 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -184,10 +184,7 @@ static u32 iwl_mvm_tx_csum(struct iwl_mvm *mvm, struct sk_buff *skb,
                           struct ieee80211_tx_info *info,
                           bool amsdu)
 {
-       if (mvm->trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_BZ ||
-           (mvm->trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_BZ &&
-            CSR_HW_REV_TYPE(mvm->trans->hw_rev) == IWL_CFG_MAC_TYPE_GL &&
-            mvm->trans->hw_rev_step <= SILICON_B_STEP))
+       if (!iwl_mvm_has_new_tx_csum(mvm))
                return iwl_mvm_tx_csum_pre_bz(mvm, skb, info, amsdu);
        return iwl_mvm_tx_csum_bz(mvm, skb, amsdu);
 }