]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: iwlwifi: fix byte count table for old devices
authorJohannes Berg <johannes.berg@intel.com>
Thu, 25 Sep 2025 08:00:06 +0000 (10:00 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Oct 2025 11:48:39 +0000 (13:48 +0200)
commit 586e3cb33ba6890054b95aa0ade0a165890efabd upstream.

For devices handled by iwldvm, bc_table_dword was never set, but I missed
that during the removal thereof. Change the logic to not treat the byte
count table as dwords for devices older than 9000 series to fix that.

Fixes: 6570ea227826 ("wifi: iwlwifi: remove bc_table_dword transport config")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250828095500.eccd7d3939f1.Ibaffa06d0b3aa5f35a9451d94af34de208b8a2bc@changeid
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/intel/iwlwifi/pcie/tx.c

index eee55428749c92dfbb7f5c09b4e2635e95192643..5ca9712dd7f0b7d1e7a8766498ed49a2cc5ae246 100644 (file)
@@ -2093,7 +2093,8 @@ static void iwl_txq_gen1_update_byte_cnt_tbl(struct iwl_trans *trans,
                break;
        }
 
-       if (trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210)
+       if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_9000 &&
+           trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210)
                len = DIV_ROUND_UP(len, 4);
 
        if (WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX))