Commit 64f4e823 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: connac: move mt76_connac_mcu_bss_ext_tlv in connac module 



Move mt7915_mcu_bss_ext_tlv/mt7615_mcu_bss_ext_tlv in connac module
since it is shared between mt7615 and mt7915 drivers.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 54735e11

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+1 −21
Original line number Diff line number Diff line
@@ -836,26 +836,6 @@ mt7615_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, 
	return 0;

}



/* SIFS 20us + 512 byte beacon tranmitted by 1Mbps (3906us) */

#define BCN_TX_ESTIMATE_TIME (4096 + 20)

static void

mt7615_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt7615_vif *mvif)

{

	struct bss_info_ext_bss *ext;

	int ext_bss_idx, tsf_offset;

	struct tlv *tlv;



	ext_bss_idx = mvif->mt76.omac_idx - EXT_BSSID_START;

	if (ext_bss_idx < 0)

		return;



	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_EXT_BSS, sizeof(*ext));



	ext = (struct bss_info_ext_bss *)tlv;

	tsf_offset = ext_bss_idx * BCN_TX_ESTIMATE_TIME;

	ext->mbss_tsf_offset = cpu_to_le32(tsf_offset);

}



static int

mt7615_mcu_add_bss(struct mt7615_phy *phy, struct ieee80211_vif *vif,

		   struct ieee80211_sta *sta, bool enable)
@@ -878,7 +858,7 @@ mt7615_mcu_add_bss(struct mt7615_phy *phy, struct ieee80211_vif *vif, 


	if (enable && mvif->mt76.omac_idx >= EXT_BSSID_START &&

	    mvif->mt76.omac_idx < REPEATER_BSSID_START)

		mt7615_mcu_bss_ext_tlv(skb, mvif);

		mt76_connac_mcu_bss_ext_tlv(skb, &mvif->mt76);



	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD(BSS_INFO_UPDATE), true);

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c

+20 −0
Original line number Diff line number Diff line
@@ -2612,5 +2612,25 @@ int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif, 
}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_add_key);



/* SIFS 20us + 512 byte beacon tranmitted by 1Mbps (3906us) */

#define BCN_TX_ESTIMATE_TIME (4096 + 20)

void mt76_connac_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt76_vif *mvif)

{

	struct bss_info_ext_bss *ext;

	int ext_bss_idx, tsf_offset;

	struct tlv *tlv;



	ext_bss_idx = mvif->omac_idx - EXT_BSSID_START;

	if (ext_bss_idx < 0)

		return;



	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_EXT_BSS, sizeof(*ext));



	ext = (struct bss_info_ext_bss *)tlv;

	tsf_offset = ext_bss_idx * BCN_TX_ESTIMATE_TIME;

	ext->mbss_tsf_offset = cpu_to_le32(tsf_offset);

}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_ext_tlv);



MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");

MODULE_LICENSE("Dual BSD/GPL");

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h

+1 −0
Original line number Diff line number Diff line
@@ -1593,6 +1593,7 @@ int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif, 
			    struct ieee80211_key_conf *key, int mcu_cmd,

			    struct mt76_wcid *wcid, enum set_key_cmd cmd);



void mt76_connac_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt76_vif *mvif);

void mt76_connac_mcu_bss_omac_tlv(struct sk_buff *skb,

				  struct ieee80211_vif *vif);

#endif /* __MT76_CONNAC_MCU_H */

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

+1 −21
Original line number Diff line number Diff line
@@ -704,26 +704,6 @@ mt7915_mcu_bss_hw_amsdu_tlv(struct sk_buff *skb) 
	amsdu->enable = true;

}



static void

mt7915_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt7915_vif *mvif)

{

/* SIFS 20us + 512 byte beacon tranmitted by 1Mbps (3906us) */

#define BCN_TX_ESTIMATE_TIME	(4096 + 20)

	struct bss_info_ext_bss *ext;

	int ext_bss_idx, tsf_offset;

	struct tlv *tlv;



	ext_bss_idx = mvif->mt76.omac_idx - EXT_BSSID_START;

	if (ext_bss_idx < 0)

		return;



	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_EXT_BSS, sizeof(*ext));



	ext = (struct bss_info_ext_bss *)tlv;

	tsf_offset = ext_bss_idx * BCN_TX_ESTIMATE_TIME;

	ext->mbss_tsf_offset = cpu_to_le32(tsf_offset);

}



static void

mt7915_mcu_bss_bmc_tlv(struct sk_buff *skb, struct mt7915_phy *phy)

{
@@ -818,7 +798,7 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy, 


		if (mvif->mt76.omac_idx >= EXT_BSSID_START &&

		    mvif->mt76.omac_idx < REPEATER_BSSID_START)

			mt7915_mcu_bss_ext_tlv(skb, mvif);

			mt76_connac_mcu_bss_ext_tlv(skb, &mvif->mt76);

	}

out:

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,