Commit 10bdbb97 authored by Ryder Lee's avatar Ryder Lee Committed by Ziyang Xuan
Browse files

mt76: mt7915: rename mt7915_mcu_get_rate_info to mt7915_mcu_get_tx_rate 

mainline inclusion
from mainline-v5.11-rc1
commit e4c5ead6
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I94J23
CVE: CVE-2021-47028

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e4c5ead632ffd87fc387f306b9e622fe52e97e5a



--------------------------------

Avoid confusion with rx rate query function.

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Conflicts:
	drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
Signed-off-by: default avatarZiyang Xuan <william.xuanziyang@huawei.com>
parent be9de0f7

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

+1 −1
Original line number Diff line number Diff line
@@ -1320,7 +1320,7 @@ mt7915_mac_sta_stats_work(struct mt7915_phy *phy) 
		spin_unlock_bh(&dev->sta_poll_lock);



		/* use MT_TX_FREE_RATE to report Tx rate for further devices */

		mt7915_mcu_get_rate_info(dev, RATE_CTRL_RU_INFO, msta->wcid.idx);

		mt7915_mcu_get_tx_rate(dev, RATE_CTRL_RU_INFO, msta->wcid.idx);



		spin_lock_bh(&dev->sta_poll_lock);

	}

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

+5 −5
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ mt7915_mcu_rx_radar_detected(struct mt7915_dev *dev, struct sk_buff *skb) 
}



static void

mt7915_mcu_tx_rate_cal(struct mt76_phy *mphy, struct mt7915_mcu_ra_info *ra,

mt7915_mcu_tx_rate_parse(struct mt76_phy *mphy, struct mt7915_mcu_ra_info *ra,

			 struct rate_info *rate, u16 r)

{

	struct ieee80211_supported_band *sband;
@@ -532,11 +532,11 @@ mt7915_mcu_tx_rate_report(struct mt7915_dev *dev, struct sk_buff *skb) 
		mphy = dev->mt76.phy2;



	/* current rate */

	mt7915_mcu_tx_rate_cal(mphy, ra, &rate, curr);

	mt7915_mcu_tx_rate_parse(mphy, ra, &rate, curr);

	stats->tx_rate = rate;



	/* probing rate */

	mt7915_mcu_tx_rate_cal(mphy, ra, &prob_rate, probe);

	mt7915_mcu_tx_rate_parse(mphy, ra, &prob_rate, probe);

	stats->prob_rate = prob_rate;



	if (attempts) {
@@ -3263,7 +3263,7 @@ int mt7915_mcu_get_temperature(struct mt7915_dev *dev, int index) 
				   sizeof(req), true);

}



int mt7915_mcu_get_rate_info(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx)

int mt7915_mcu_get_tx_rate(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx)

{

	struct {

		__le32 cmd;

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

+1 −1
Original line number Diff line number Diff line
@@ -327,8 +327,8 @@ int mt7915_mcu_set_pulse_th(struct mt7915_dev *dev, 
			    const struct mt7915_dfs_pulse *pulse);

int mt7915_mcu_set_radar_th(struct mt7915_dev *dev, int index,

			    const struct mt7915_dfs_pattern *pattern);

int mt7915_mcu_get_rate_info(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx);

int mt7915_mcu_get_temperature(struct mt7915_dev *dev, int index);

int mt7915_mcu_get_tx_rate(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx);

int mt7915_mcu_rdd_cmd(struct mt7915_dev *dev, enum mt7915_rdd_cmd cmd,

		       u8 index, u8 rx_sel, u8 val);

int mt7915_mcu_fw_log_2_host(struct mt7915_dev *dev, u8 ctrl);