Re: [PATCH] wifi: mt76: mt7996: use the correct vif link for scanning/roc

[Lorenzo Bianconi <lorenzo@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1193 bytes --]

> restore fix which was dropped during MLO rework
> 
> Fixes: f0b0b239b8f3 ("wifi: mt76: mt7996: rework mt7996_mac_write_txwi() for MLO support")
> Signed-off-by: Chad Monroe <chad@monroe.io>

Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>

> ---
>  drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
> index 226534490792..6333a064c4f7 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
> @@ -903,8 +903,12 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
>  				       IEEE80211_TX_CTRL_MLO_LINK);
>  
>  	mvif = vif ? (struct mt7996_vif *)vif->drv_priv : NULL;
> -	if (mvif)
> -		mlink = rcu_dereference(mvif->mt76.link[link_id]);
> +	if (mvif) {
> +		if (wcid->offchannel)
> +			mlink = rcu_dereference(mvif->mt76.offchannel_link);
> +		if (!mlink)
> +			mlink = rcu_dereference(mvif->mt76.link[link_id]);
> +	}
>  
>  	if (mlink) {
>  		omac_idx = mlink->omac_idx;
> -- 
> 2.47.2
> 
> 
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]