Commit 934da21f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2025-09-17' of... 

Merge tag 'wireless-2025-09-17' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless

Johannes Berg says:

====================
Just two fixes:
 - fix crash in rfkill due to uninitialized type_name
 - fix aggregation in iwlwifi 7000/8000 devices

* tag 'wireless-2025-09-17' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  net: rfkill: gpio: Fix crash due to dereferencering uninitialized pointer
  wifi: iwlwifi: pcie: fix byte count table for some devices
====================

Link: https://patch.msgid.link/20250917105159.161583-3-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d7995c2b b6f56a44

drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/rfkill/rfkill-gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -94,10 +94,10 @@ static const struct dmi_system_id rfkill_gpio_deny_table[] = { 
static int rfkill_gpio_probe(struct platform_device *pdev)

{

	struct rfkill_gpio_data *rfkill;

	struct gpio_desc *gpio;

	const char *type_name = NULL;

	const char *name_property;

	const char *type_property;

	const char *type_name;

	struct gpio_desc *gpio;

	int ret;



	if (dmi_check_system(rfkill_gpio_deny_table))