Commit 2557e568 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: mt7915: rely on mt76_connac_mcu_wtbl_smps_tlv 



Rely on mt76_connac_mcu_wtbl_smps_tlv routine in mt7915
and remove duplicated code.

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

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

+5 −6
Original line number Diff line number Diff line
@@ -861,8 +861,8 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb, 
}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_tlv);



static void

mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,

void mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb,

				   struct ieee80211_sta *sta,

				   void *sta_wtbl, void *wtbl_tlv)

{

	struct wtbl_smps *smps;
@@ -871,10 +871,9 @@ mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, 
	tlv = mt76_connac_mcu_add_nested_tlv(skb, WTBL_SMPS, sizeof(*smps),

					     wtbl_tlv, sta_wtbl);

	smps = (struct wtbl_smps *)tlv;



	if (sta->smps_mode == IEEE80211_SMPS_DYNAMIC)

		smps->smps = true;

	smps->smps = (sta->smps_mode == IEEE80211_SMPS_DYNAMIC);

}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_smps_tlv);



void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb,

				 struct ieee80211_sta *sta, void *sta_wtbl,

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

+3 −0
Original line number Diff line number Diff line
@@ -1603,4 +1603,7 @@ int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb, 
				  bool enable);

void mt76_connac_mcu_sta_uapsd(struct sk_buff *skb, struct ieee80211_vif *vif,

			       struct ieee80211_sta *sta);

void mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb,

				   struct ieee80211_sta *sta,

				   void *sta_wtbl, void *wtbl_tlv);

#endif /* __MT76_CONNAC_MCU_H */

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

+2 −15
Original line number Diff line number Diff line
@@ -1022,19 +1022,6 @@ mt7915_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, 
	msta->wcid.amsdu = true;

}



static void

mt7915_mcu_wtbl_smps_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,

			 void *sta_wtbl, void *wtbl_tlv)

{

	struct wtbl_smps *smps;

	struct tlv *tlv;



	tlv = mt76_connac_mcu_add_nested_tlv(skb, WTBL_SMPS, sizeof(*smps),

					     wtbl_tlv, sta_wtbl);

	smps = (struct wtbl_smps *)tlv;

	smps->smps = (sta->smps_mode == IEEE80211_SMPS_DYNAMIC);

}



static void

mt7915_mcu_wtbl_ht_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta, void *sta_wtbl,
@@ -1075,7 +1062,7 @@ mt7915_mcu_wtbl_ht_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, 
			ht->af = max_t(u8, ht->af, af);

	}



	mt7915_mcu_wtbl_smps_tlv(skb, sta, sta_wtbl, wtbl_tlv);

	mt76_connac_mcu_wtbl_smps_tlv(skb, sta, sta_wtbl, wtbl_tlv);

}



static void
@@ -1509,7 +1496,7 @@ int mt7915_mcu_add_smps(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
	if (IS_ERR(wtbl_hdr))

		return PTR_ERR(wtbl_hdr);



	mt7915_mcu_wtbl_smps_tlv(skb, sta, sta_wtbl, wtbl_hdr);

	mt76_connac_mcu_wtbl_smps_tlv(skb, sta, sta_wtbl, wtbl_hdr);



	ret = mt76_mcu_skb_send_msg(&dev->mt76, skb,

				    MCU_EXT_CMD(STA_REC_UPDATE), true);