Merge tag 'iwlwifi-fixes-2025-09-15' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

jmberg-intel · jmberg-intel · commit e882985b09b2 · 2025-09-17T12:36:08.000+02:00
Miri Korenblit says:
====================
iwlwifi fix
====================

The fix is for byte count tables in 7000/8000 family devices.

Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
@@ -2092,7 +2092,7 @@ static void iwl_txq_gen1_update_byte_cnt_tbl(struct iwl_trans *trans,
 		break;
 	}
 
-	if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_9000 &&
+	if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_7000 &&
 	    trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210)
 		len = DIV_ROUND_UP(len, 4);
 

Original file line number	Diff line number	Diff line change
`@@ -2092,7 +2092,7 @@ static void iwl_txq_gen1_update_byte_cnt_tbl(struct iwl_trans *trans,`
`2092`	`2092`	`break;`
`2093`	`2093`	`}`
`2094`	`2094`
`2095`		`- if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_9000 &&`
	`2095`	`+ if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_7000 &&`
`2096`	`2096`	`trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210)`
`2097`	`2097`	`len = DIV_ROUND_UP(len, 4);`
`2098`	`2098`