mt76: connac: add support for passing the cipher field in bss_info

Initialize it from a field in struct mt76_vif

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 4accfb5d553008c8f4d8d0663dc7c0df0f99b89d..14f60fcb6a34640924ef8cb5a58a35c2fb4c5ad4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -622,6 +622,7 @@ struct mt76_vif {
        u8 band_idx;
        u8 wmm_idx;
        u8 scan_seq_num;
+       u8 cipher;
 };
 
 struct mt76_phy {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 1b2340e4ce0cd0d89501cd09dd0a3a266159c326..cdd82a62eeb1e7f063b34f34456358fdd6a7a672 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -2701,6 +2701,7 @@ int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,
        bss->bmc_wcid_hi = to_wcid_hi(wlan_idx);
        bss->wmm_idx = mvif->wmm_idx;
        bss->active = enable;
+       bss->cipher = mvif->cipher;
 
        if (vif->type != NL80211_IFTYPE_MONITOR) {
                struct cfg80211_chan_def *chandef = &phy->chandef;