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

mt76: mt7915: rely on mt76_connac_mcu_set_rts_thresh 



Rely on mt76_connac_mcu_set_rts_thresh routine in mt7915 driver and
remove duplicated code.

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

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

+3 −2
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ static int mt7915_start(struct ieee80211_hw *hw) 
		mt7915_mac_enable_nf(dev, 1);

	}



	ret = mt7915_mcu_set_rts_thresh(phy, 0x92b);

	ret = mt76_connac_mcu_set_rts_thresh(&dev->mt76, 0x92b,

					     phy != &dev->phy);

	if (ret)

		goto out;
@@ -747,7 +748,7 @@ static int mt7915_set_rts_threshold(struct ieee80211_hw *hw, u32 val) 
	int ret;



	mutex_lock(&dev->mt76.mutex);

	ret = mt7915_mcu_set_rts_thresh(phy, val);

	ret = mt76_connac_mcu_set_rts_thresh(&dev->mt76, val, phy != &dev->phy);

	mutex_unlock(&dev->mt76.mutex);



	return ret;

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

+0 −20
Original line number Diff line number Diff line
@@ -2483,26 +2483,6 @@ int mt7915_mcu_set_scs(struct mt7915_dev *dev, u8 band, bool enable) 
				 sizeof(req), false);

}



int mt7915_mcu_set_rts_thresh(struct mt7915_phy *phy, u32 val)

{

	struct mt7915_dev *dev = phy->dev;

	struct {

		u8 prot_idx;

		u8 band;

		u8 rsv[2];

		__le32 len_thresh;

		__le32 pkt_thresh;

	} __packed req = {

		.prot_idx = 1,

		.band = phy != &dev->phy,

		.len_thresh = cpu_to_le32(val),

		.pkt_thresh = cpu_to_le32(0x2),

	};



	return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(PROTECT_CTRL), &req,

				 sizeof(req), true);

}



int mt7915_mcu_update_edca(struct mt7915_dev *dev, void *param)

{

	struct mt7915_mcu_tx *req = (struct mt7915_mcu_tx *)param;

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

+0 −1
Original line number Diff line number Diff line
@@ -440,7 +440,6 @@ int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode, 
			      u8 en);

int mt7915_mcu_set_scs(struct mt7915_dev *dev, u8 band, bool enable);

int mt7915_mcu_set_ser(struct mt7915_dev *dev, u8 action, u8 set, u8 band);

int mt7915_mcu_set_rts_thresh(struct mt7915_phy *phy, u32 val);

int mt7915_mcu_set_sku_en(struct mt7915_phy *phy, bool enable);

int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy);

int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len);