Commit 54735e11 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: connac: move mt76_connac_mcu_bss_omac_tlv in connac module 



Move mt7915_mcu_bss_omac_tlv/mt7615_mcu_bss_omac_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 ca6d07e8

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

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

}



static void

mt7615_mcu_bss_omac_tlv(struct sk_buff *skb, struct ieee80211_vif *vif)

{

	struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;

	u8 omac_idx = mvif->mt76.omac_idx;

	struct bss_info_omac *omac;

	struct tlv *tlv;

	u32 type = 0;



	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_OMAC, sizeof(*omac));



	switch (vif->type) {

	case NL80211_IFTYPE_MONITOR:

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_AP:

		if (vif->p2p)

			type = CONNECTION_P2P_GO;

		else

			type = CONNECTION_INFRA_AP;

		break;

	case NL80211_IFTYPE_STATION:

		if (vif->p2p)

			type = CONNECTION_P2P_GC;

		else

			type = CONNECTION_INFRA_STA;

		break;

	case NL80211_IFTYPE_ADHOC:

		type = CONNECTION_IBSS_ADHOC;

		break;

	default:

		WARN_ON(1);

		break;

	}



	omac = (struct bss_info_omac *)tlv;

	omac->conn_type = cpu_to_le32(type);

	omac->omac_idx = mvif->mt76.omac_idx;

	omac->band_idx = mvif->mt76.band_idx;

	omac->hw_bss_idx = omac_idx > EXT_BSSID_START ? HW_BSSID_0 : omac_idx;

}



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

#define BCN_TX_ESTIMATE_TIME (4096 + 20)

static void
@@ -913,7 +872,7 @@ mt7615_mcu_add_bss(struct mt7615_phy *phy, struct ieee80211_vif *vif, 
		return PTR_ERR(skb);



	if (enable)

		mt7615_mcu_bss_omac_tlv(skb, vif);

		mt76_connac_mcu_bss_omac_tlv(skb, vif);



	mt7615_mcu_bss_basic_tlv(skb, vif, sta, phy, enable);

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

+42 −0
Original line number Diff line number Diff line
@@ -316,6 +316,48 @@ mt76_connac_mcu_alloc_wtbl_req(struct mt76_dev *dev, struct mt76_wcid *wcid, 
}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_alloc_wtbl_req);



void mt76_connac_mcu_bss_omac_tlv(struct sk_buff *skb,

				  struct ieee80211_vif *vif)

{

	struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;

	u8 omac_idx = mvif->omac_idx;

	struct bss_info_omac *omac;

	struct tlv *tlv;

	u32 type = 0;



	switch (vif->type) {

	case NL80211_IFTYPE_MONITOR:

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_AP:

		if (vif->p2p)

			type = CONNECTION_P2P_GO;

		else

			type = CONNECTION_INFRA_AP;

		break;

	case NL80211_IFTYPE_STATION:

		if (vif->p2p)

			type = CONNECTION_P2P_GC;

		else

			type = CONNECTION_INFRA_STA;

		break;

	case NL80211_IFTYPE_ADHOC:

		type = CONNECTION_IBSS_ADHOC;

		break;

	default:

		WARN_ON(1);

		break;

	}



	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_OMAC, sizeof(*omac));



	omac = (struct bss_info_omac *)tlv;

	omac->conn_type = cpu_to_le32(type);

	omac->omac_idx = mvif->omac_idx;

	omac->band_idx = mvif->band_idx;

	omac->hw_bss_idx = omac_idx > EXT_BSSID_START ? HW_BSSID_0 : omac_idx;

}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_omac_tlv);



void mt76_connac_mcu_sta_basic_tlv(struct sk_buff *skb,

				   struct ieee80211_vif *vif,

				   struct ieee80211_sta *sta,

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

+3 −0
Original line number Diff line number Diff line
@@ -1592,4 +1592,7 @@ int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif, 
			    struct mt76_connac_sta_key_conf *sta_key_conf,

			    struct ieee80211_key_conf *key, int mcu_cmd,

			    struct mt76_wcid *wcid, enum set_key_cmd cmd);



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 −38
Original line number Diff line number Diff line
@@ -552,43 +552,6 @@ mt7915_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, 
	return 0;

}



static void

mt7915_mcu_bss_omac_tlv(struct sk_buff *skb, struct ieee80211_vif *vif)

{

	struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;

	struct bss_info_omac *omac;

	struct tlv *tlv;

	u32 type = 0;

	u8 idx;



	tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_OMAC, sizeof(*omac));



	switch (vif->type) {

	case NL80211_IFTYPE_MONITOR:

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_AP:

		type = CONNECTION_INFRA_AP;

		break;

	case NL80211_IFTYPE_STATION:

		type = CONNECTION_INFRA_STA;

		break;

	case NL80211_IFTYPE_ADHOC:

		type = CONNECTION_IBSS_ADHOC;

		break;

	default:

		WARN_ON(1);

		break;

	}



	omac = (struct bss_info_omac *)tlv;

	idx = mvif->mt76.omac_idx > EXT_BSSID_START ? HW_BSSID_0

						    : mvif->mt76.omac_idx;

	omac->conn_type = cpu_to_le32(type);

	omac->omac_idx = mvif->mt76.omac_idx;

	omac->band_idx = mvif->mt76.band_idx;

	omac->hw_bss_idx = idx;

}



struct mt7915_he_obss_narrow_bw_ru_data {

	bool tolerated;

};
@@ -837,7 +800,7 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy, 


	/* bss_omac must be first */

	if (enable)

		mt7915_mcu_bss_omac_tlv(skb, vif);

		mt76_connac_mcu_bss_omac_tlv(skb, vif);



	mt7915_mcu_bss_basic_tlv(skb, vif, phy, enable);