]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: iwlwifi: mvm: fix assert on suspend
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>
Wed, 4 Jun 2025 03:13:18 +0000 (06:13 +0300)
committerMiri Korenblit <miriam.rachel.korenblit@intel.com>
Wed, 4 Jun 2025 16:07:21 +0000 (19:07 +0300)
After using DEFINE_RAW_FLEX, cmd is a pointer to iwl_rxq_sync_cmd,
and not a variable containing both the command and notification.
Adjust hcmd->data and hcmd->len assignment as well.

Fixes: 7438843df8cf ("wifi: iwlwifi: mvm: Avoid -Wflex-array-member-not-at-end warning")
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250604031321.2277481-2-miriam.rachel.korenblit@intel.com
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

index 0f056a6641bd48e80088790de2d5cf56182c61aa..956b491ae5a482366c1e7b2cdaee0b899e874e33 100644 (file)
@@ -6360,8 +6360,8 @@ void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm,
                        (struct iwl_mvm_internal_rxq_notif *)cmd->payload;
        struct iwl_host_cmd hcmd = {
                .id = WIDE_ID(DATA_PATH_GROUP, TRIGGER_RX_QUEUES_NOTIF_CMD),
-               .data[0] = &cmd,
-               .len[0] = sizeof(cmd),
+               .data[0] = cmd,
+               .len[0] = __struct_size(cmd),
                .data[1] = data,
                .len[1] = size,
                .flags = CMD_SEND_IN_RFKILL | (sync ? 0 : CMD_ASYNC),