mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-08 09:12:39 -04:00
wifi: mt76: mt7925: add mt7925_mcu_sta_eht_mld_tlv for MLO
add mt7925_mcu_sta_eht_mld_tlv for the MLO-enabled firmware. Co-developed-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com> Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com> Co-developed-by: Deren Wu <deren.wu@mediatek.com> Signed-off-by: Deren Wu <deren.wu@mediatek.com> Signed-off-by: Sean Wang <sean.wang@mediatek.com> Link: https://patch.msgid.link/a1001592eeef4e4ee2c3e15dc94cca0815d64e59.1720248331.git.sean.wang@kernel.org Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
@@ -820,6 +820,7 @@ enum {
|
||||
STA_REC_HE_6G = 0x17,
|
||||
STA_REC_HE_V2 = 0x19,
|
||||
STA_REC_MLD = 0x20,
|
||||
STA_REC_EHT_MLD = 0x21,
|
||||
STA_REC_EHT = 0x22,
|
||||
STA_REC_MLD_OFF = 0x23,
|
||||
STA_REC_REMOVE = 0x25,
|
||||
|
||||
@@ -1738,6 +1738,42 @@ mt7925_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb,
|
||||
HT_MCS_MASK_NUM);
|
||||
}
|
||||
|
||||
static void
|
||||
mt7925_mcu_sta_eht_mld_tlv(struct sk_buff *skb,
|
||||
struct ieee80211_vif *vif, struct ieee80211_sta *sta)
|
||||
{
|
||||
struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
|
||||
struct wiphy *wiphy = mvif->phy->mt76->hw->wiphy;
|
||||
const struct wiphy_iftype_ext_capab *ext_capa;
|
||||
struct sta_rec_eht_mld *eht_mld;
|
||||
struct tlv *tlv;
|
||||
u16 eml_cap;
|
||||
|
||||
tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_EHT_MLD, sizeof(*eht_mld));
|
||||
eht_mld = (struct sta_rec_eht_mld *)tlv;
|
||||
eht_mld->mld_type = 0xff;
|
||||
|
||||
if (!ieee80211_vif_is_mld(vif))
|
||||
return;
|
||||
|
||||
ext_capa = cfg80211_get_iftype_ext_capa(wiphy,
|
||||
ieee80211_vif_type_p2p(vif));
|
||||
if (!ext_capa)
|
||||
return;
|
||||
|
||||
eml_cap = (vif->cfg.eml_cap & (IEEE80211_EML_CAP_EMLSR_SUPP |
|
||||
IEEE80211_EML_CAP_TRANSITION_TIMEOUT)) |
|
||||
(ext_capa->eml_capabilities & (IEEE80211_EML_CAP_EMLSR_PADDING_DELAY |
|
||||
IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY));
|
||||
|
||||
if (eml_cap & IEEE80211_EML_CAP_EMLSR_SUPP) {
|
||||
eht_mld->eml_cap[0] = u16_get_bits(eml_cap, GENMASK(7, 0));
|
||||
eht_mld->eml_cap[1] = u16_get_bits(eml_cap, GENMASK(15, 8));
|
||||
} else {
|
||||
eht_mld->str_cap[0] = BIT(1);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
mt7925_mcu_sta_mld_tlv(struct sk_buff *skb,
|
||||
struct ieee80211_vif *vif, struct ieee80211_sta *sta)
|
||||
@@ -1858,8 +1894,12 @@ mt7925_mcu_mlo_sta_cmd(struct mt76_phy *phy,
|
||||
mt7925_mcu_sta_state_v2_tlv(phy, skb, info->link_sta,
|
||||
info->vif, info->rcpi,
|
||||
info->state);
|
||||
if (info->state != MT76_STA_INFO_STATE_NONE)
|
||||
|
||||
if (info->state != MT76_STA_INFO_STATE_NONE) {
|
||||
mt7925_mcu_sta_mld_tlv(skb, info->vif, info->link_sta->sta);
|
||||
mt7925_mcu_sta_eht_mld_tlv(skb, info->vif, info->link_sta->sta);
|
||||
}
|
||||
|
||||
mt7925_mcu_sta_hdr_trans_tlv(skb, info->vif, info->link_sta);
|
||||
}
|
||||
|
||||
|
||||
@@ -443,6 +443,17 @@ struct sta_rec_mld {
|
||||
} __packed link[2];
|
||||
} __packed;
|
||||
|
||||
struct sta_rec_eht_mld {
|
||||
__le16 tag;
|
||||
__le16 len;
|
||||
u8 nsep;
|
||||
u8 mld_type;
|
||||
u8 __rsv1[1];
|
||||
u8 str_cap[3];
|
||||
u8 eml_cap[3];
|
||||
u8 __rsv2[3];
|
||||
} __packed;
|
||||
|
||||
struct bss_ifs_time_tlv {
|
||||
__le16 tag;
|
||||
__le16 len;
|
||||
|
||||
Reference in New Issue
Block a user