From ebd522981ba69989254f6989268ea32cbf4b1387 Mon Sep 17 00:00:00 2001 From: Sean Wang Date: Sat, 6 Jul 2024 01:28:03 -0700 Subject: [PATCH] wifi: mt76: mt7925: report link information in rx status report link information in rx status Co-developed-by: Ming Yen Hsieh Signed-off-by: Ming Yen Hsieh Co-developed-by: Deren Wu Signed-off-by: Deren Wu Signed-off-by: Sean Wang Link: https://patch.msgid.link/c7cdc17d94375a76802a5c4a825ea3e51cdb53af.1720248331.git.sean.wang@kernel.org Signed-off-by: Felix Fietkau --- mac80211.c | 5 +++++ mt76.h | 1 + mt7925/main.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/mac80211.c b/mac80211.c index 94e85ed9..6d47b26d 100644 --- a/mac80211.c +++ b/mac80211.c @@ -1117,6 +1117,11 @@ mt76_rx_convert(struct mt76_dev *dev, struct sk_buff *skb, memcpy(status->chain_signal, mstat.chain_signal, sizeof(mstat.chain_signal)); + if (mstat.wcid) { + status->link_valid = mstat.wcid->link_valid; + status->link_id = mstat.wcid->link_id; + } + *sta = wcid_to_sta(mstat.wcid); *hw = mt76_phy_hw(dev, mstat.phy_idx); } diff --git a/mt76.h b/mt76.h index 95731c10..edbc75da 100644 --- a/mt76.h +++ b/mt76.h @@ -354,6 +354,7 @@ struct mt76_wcid { u8 amsdu:1; u8 phy_idx:2; u8 link_id:4; + bool link_valid; u8 rx_check_pn; u8 rx_key_pn[IEEE80211_NUM_TIDS + 1][6]; diff --git a/mt7925/main.c b/mt7925/main.c index 3d23a87e..be0a336f 100644 --- a/mt7925/main.c +++ b/mt7925/main.c @@ -811,6 +811,7 @@ static int mt7925_mac_link_sta_add(struct mt76_dev *mdev, mlink->wcid.tx_info |= MT_WCID_TX_INFO_SET; mlink->last_txs = jiffies; mlink->wcid.link_id = link_sta->link_id; + mlink->wcid.link_valid = !!link_sta->sta->valid_links; ret = mt76_connac_pm_wake(&dev->mphy, &dev->pm); if (ret) @@ -1898,6 +1899,7 @@ mt7925_change_vif_links(struct ieee80211_hw *hw, struct ieee80211_vif *vif, mconf->link_id = link_id; mconf->vif = mvif; mlink->wcid.link_id = link_id; + mlink->wcid.link_valid = !!vif->valid_links; } if (hweight16(mvif->valid_links) == 0)