Commit 5a521c0f authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: connac: move mt76_connac_mcu_wtbl_update_hdr_trans in connac module 



Move mt76_connac_mcu_wtbl_update_hdr_trans routine in mt76-connac module
since it is shared between mt7915 and mt7615 drivers.

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

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

+1 −13
Original line number Diff line number Diff line
@@ -945,19 +945,7 @@ mt7615_mcu_wtbl_update_hdr_trans(struct mt7615_dev *dev, 
				 struct ieee80211_vif *vif,

				 struct ieee80211_sta *sta)

{

	struct mt7615_sta *msta = (struct mt7615_sta *)sta->drv_priv;

	struct wtbl_req_hdr *wtbl_hdr;

	struct sk_buff *skb = NULL;



	wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(&dev->mt76, &msta->wcid,

						  WTBL_SET, NULL, &skb);

	if (IS_ERR(wtbl_hdr))

		return PTR_ERR(wtbl_hdr);



	mt76_connac_mcu_wtbl_hdr_trans_tlv(skb, vif, &msta->wcid, NULL,

					   wtbl_hdr);

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD(WTBL_UPDATE), true);

	return mt76_connac_mcu_wtbl_update_hdr_trans(&dev->mt76, vif, sta);

}



static const struct mt7615_mcu_ops wtbl_update_ops = {

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

+19 −0
Original line number Diff line number Diff line
@@ -507,6 +507,25 @@ int mt76_connac_mcu_sta_update_hdr_trans(struct mt76_dev *dev, 
}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_update_hdr_trans);



int mt76_connac_mcu_wtbl_update_hdr_trans(struct mt76_dev *dev,

					  struct ieee80211_vif *vif,

					  struct ieee80211_sta *sta)

{

	struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv;

	struct wtbl_req_hdr *wtbl_hdr;

	struct sk_buff *skb = NULL;



	wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(dev, wcid, WTBL_SET, NULL,

						  &skb);

	if (IS_ERR(wtbl_hdr))

		return PTR_ERR(wtbl_hdr);



	mt76_connac_mcu_wtbl_hdr_trans_tlv(skb, vif, wcid, NULL, wtbl_hdr);



	return mt76_mcu_skb_send_msg(dev, skb, MCU_EXT_CMD(WTBL_UPDATE), true);

}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_update_hdr_trans);



void mt76_connac_mcu_wtbl_generic_tlv(struct mt76_dev *dev,

				      struct sk_buff *skb,

				      struct ieee80211_vif *vif,

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

+3 −0
Original line number Diff line number Diff line
@@ -1512,6 +1512,9 @@ void mt76_connac_mcu_wtbl_hdr_trans_tlv(struct sk_buff *skb, 
int mt76_connac_mcu_sta_update_hdr_trans(struct mt76_dev *dev,

					 struct ieee80211_vif *vif,

					 struct mt76_wcid *wcid, int cmd);

int mt76_connac_mcu_wtbl_update_hdr_trans(struct mt76_dev *dev,

					  struct ieee80211_vif *vif,

					  struct ieee80211_sta *sta);

void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,

			     struct ieee80211_sta *sta,

			     struct ieee80211_vif *vif,

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

+2 −2
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ static void mt7915_sta_set_4addr(struct ieee80211_hw *hw, 
	else

		clear_bit(MT_WCID_FLAG_4ADDR, &msta->wcid.flags);



	mt7915_mcu_sta_update_hdr_trans(dev, vif, sta);

	mt76_connac_mcu_wtbl_update_hdr_trans(&dev->mt76, vif, sta);

}



static void mt7915_sta_set_decap_offload(struct ieee80211_hw *hw,
@@ -1109,7 +1109,7 @@ static void mt7915_sta_set_decap_offload(struct ieee80211_hw *hw, 
	else

		clear_bit(MT_WCID_FLAG_HDR_TRANS, &msta->wcid.flags);



	mt7915_mcu_sta_update_hdr_trans(dev, vif, sta);

	mt76_connac_mcu_wtbl_update_hdr_trans(&dev->mt76, vif, sta);

}



static const char mt7915_gstrings_stats[][ETH_GSTRING_LEN] = {

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

+0 −24
Original line number Diff line number Diff line
@@ -1052,30 +1052,6 @@ mt7915_mcu_sta_wtbl_tlv(struct mt7915_dev *dev, struct sk_buff *skb, 
	return 0;

}



int mt7915_mcu_sta_update_hdr_trans(struct mt7915_dev *dev,

				    struct ieee80211_vif *vif,

				    struct ieee80211_sta *sta)

{

	struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;

	struct wtbl_req_hdr *wtbl_hdr;

	struct sk_buff *skb;



	skb = mt76_mcu_msg_alloc(&dev->mt76, NULL,

				 MT76_CONNAC_WTBL_UPDATE_MAX_SIZE);

	if (!skb)

		return -ENOMEM;



	wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(&dev->mt76, &msta->wcid,

						  WTBL_SET, NULL, &skb);

	if (IS_ERR(wtbl_hdr))

		return PTR_ERR(wtbl_hdr);



	mt76_connac_mcu_wtbl_hdr_trans_tlv(skb, vif, &msta->wcid, NULL,

					   wtbl_hdr);

	return mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_EXT_CMD(WTBL_UPDATE),

				     true);

}



static inline bool

mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif,

			struct ieee80211_sta *sta, bool bfee)