Commit 98d8a003 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: Don't access vif valid links directly 



And instead use the vif getter functions, as a preparation for
supporting disabled/dormant links.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230615094410.61ca688cbbf1.Ic1b4049cf156238ff16e6c57959004da911cb5c8@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 12bacfc2

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+1 −1
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ u8 iwl_mvm_mac_ctxt_get_lowest_rate(struct iwl_mvm *mvm, 
	u8 rate;

	u32 i;



	if (link_id == IEEE80211_LINK_UNSPECIFIED && vif->valid_links) {

	if (link_id == IEEE80211_LINK_UNSPECIFIED && ieee80211_vif_is_mld(vif)) {

		for (i = 0; i < ARRAY_SIZE(mvmvif->link); i++) {

			if (!mvmvif->link[i])

				continue;

drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static u32 iwl_mvm_get_sec_sta_mask(struct iwl_mvm *mvm, 
	 * Of course the same can be done during add as well, but we must do

	 * it during remove, since we don't have the mvmvif->ap_sta pointer.

	 */

	if (!sta && (keyconf->link_id >= 0 || !vif->valid_links))

	if (!sta && (keyconf->link_id >= 0 || !ieee80211_vif_is_mld(vif)))

		return BIT(link_info->ap_sta_id);



	/* STA should be non-NULL now, but iwl_mvm_sta_fw_id_mask() checks */

drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2022 Intel Corporation

 * Copyright (C) 2022 - 2023 Intel Corporation

 */

#include "mvm.h"
@@ -50,7 +50,7 @@ static void iwl_mvm_mld_mac_ctxt_cmd_common(struct iwl_mvm *mvm, 
	 * the association response successfully, so just skip all that

	 * and enable both when we have MLO.

	 */

	if (vif->valid_links) {

	if (ieee80211_vif_is_mld(vif)) {

		iwl_mvm_mld_set_he_support(mvm, vif, cmd);

		cmd->eht_support = cpu_to_le32(1);

		return;