Commit 2eec60dc authored by Ryder Lee's avatar Ryder Lee Committed by Felix Fietkau
Browse files

mt76: mt7915: remove mt7915_mcu_add_he() 



Make mt7915_mcu_sta_he_tlv() as a part of mt7915_mcu_add_rate_ctrl() as
firmware rate control should get HE rate information from sta_rec_he,
and reduce a global function accordingly.

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 03a25c01

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

+2 −4
Original line number Diff line number Diff line
@@ -2077,10 +2077,8 @@ void mt7915_mac_sta_rc_work(struct work_struct *work) 


		if (changed & (IEEE80211_RC_SUPP_RATES_CHANGED |

			       IEEE80211_RC_NSS_CHANGED |

			       IEEE80211_RC_BW_CHANGED)) {

			mt7915_mcu_add_he(dev, vif, sta);

			mt7915_mcu_add_rate_ctrl(dev, vif, sta);

		}

			       IEEE80211_RC_BW_CHANGED))

			mt7915_mcu_add_rate_ctrl(dev, vif, sta, true);



		if (changed & IEEE80211_RC_SMPS_CHANGED)

			mt7915_mcu_add_smps(dev, vif, sta);

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

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	if (ret)

		return ret;



	return mt7915_mcu_add_rate_ctrl(dev, vif, sta);

	return mt7915_mcu_add_rate_ctrl(dev, vif, sta, false);

}



void mt7915_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,

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

+10 −26
Original line number Diff line number Diff line
@@ -2149,42 +2149,26 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev, 
}



int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif,

			     struct ieee80211_sta *sta)

			     struct ieee80211_sta *sta, bool changed)

{

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

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

	struct sk_buff *skb;

	int len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_ra);



	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	mt7915_mcu_sta_rate_ctrl_tlv(skb, dev, vif, sta);



	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD(STA_REC_UPDATE), true);

}



int mt7915_mcu_add_he(struct mt7915_dev *dev, struct ieee80211_vif *vif,

		      struct ieee80211_sta *sta)

{

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

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

	struct sk_buff *skb;

	int len;



	if (!sta->he_cap.has_he)

		return 0;



	len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_he);



	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);

	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,

				       MT7915_STA_UPDATE_MAX_SIZE);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	/* firmware rc algorithm refers to sta_rec_he for HE control.

	 * once dev->rc_work changes the settings driver should also

	 * update sta_rec_he here.

	 */

	if (sta->he_cap.has_he && changed)

		mt7915_mcu_sta_he_tlv(skb, sta, vif);



	mt7915_mcu_sta_rate_ctrl_tlv(skb, dev, vif, sta);



	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD(STA_REC_UPDATE), true);

}

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

+1 −3
Original line number Diff line number Diff line
@@ -409,9 +409,7 @@ int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
int mt7915_mcu_add_obss_spr(struct mt7915_dev *dev, struct ieee80211_vif *vif,

                            bool enable);

int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif,

			     struct ieee80211_sta *sta);

int mt7915_mcu_add_he(struct mt7915_dev *dev, struct ieee80211_vif *vif,

		      struct ieee80211_sta *sta);

			     struct ieee80211_sta *sta, bool changed);

int mt7915_mcu_add_smps(struct mt7915_dev *dev, struct ieee80211_vif *vif,

			struct ieee80211_sta *sta);

int mt7915_set_channel(struct mt7915_phy *phy);