Commit 20ce270e authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76x02: do not set protection on set_rts_threshold callback 



Use set_rts_threshold calback to enable/disable threshold only for
legacy traffic.

Protection for HT and VHT traffic is defined by HT operation element
and it's provided by remote AP or by hostapd.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent b9f81643

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

+1 −15
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q, 
}

EXPORT_SYMBOL_GPL(mt76x02_tx_complete_skb);



void mt76x02_mac_set_tx_protection(struct mt76x02_dev *dev, u32 val)

void mt76x02_mac_set_rts_thresh(struct mt76x02_dev *dev, u32 val)

{

	u32 data = 0;
@@ -729,20 +729,6 @@ void mt76x02_mac_set_tx_protection(struct mt76x02_dev *dev, u32 val) 
		 MT_PROT_CFG_CTRL | MT_PROT_CFG_RTS_THRESH, data);

	mt76_rmw(dev, MT_OFDM_PROT_CFG,

		 MT_PROT_CFG_CTRL | MT_PROT_CFG_RTS_THRESH, data);

	mt76_rmw(dev, MT_MM20_PROT_CFG,

		 MT_PROT_CFG_CTRL | MT_PROT_CFG_RTS_THRESH, data);

	mt76_rmw(dev, MT_MM40_PROT_CFG,

		 MT_PROT_CFG_CTRL | MT_PROT_CFG_RTS_THRESH, data);

	mt76_rmw(dev, MT_GF20_PROT_CFG,

		 MT_PROT_CFG_CTRL | MT_PROT_CFG_RTS_THRESH, data);

	mt76_rmw(dev, MT_GF40_PROT_CFG,

		 MT_PROT_CFG_CTRL | MT_PROT_CFG_RTS_THRESH, data);

	mt76_rmw(dev, MT_TX_PROT_CFG6,

		 MT_PROT_CFG_CTRL | MT_PROT_CFG_RTS_THRESH, data);

	mt76_rmw(dev, MT_TX_PROT_CFG7,

		 MT_PROT_CFG_CTRL | MT_PROT_CFG_RTS_THRESH, data);

	mt76_rmw(dev, MT_TX_PROT_CFG8,

		 MT_PROT_CFG_CTRL | MT_PROT_CFG_RTS_THRESH, data);

}



void mt76x02_update_channel(struct mt76_dev *mdev)

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

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev, 
			    struct mt76x02_tx_status *stat, u8 *update);

int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,

			   void *rxi);

void mt76x02_mac_set_tx_protection(struct mt76x02_dev *dev, u32 val);

void mt76x02_mac_set_rts_thresh(struct mt76x02_dev *dev, u32 val);

void mt76x02_mac_setaddr(struct mt76x02_dev *dev, u8 *addr);

void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,

			    struct sk_buff *skb, struct mt76_wcid *wcid,

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

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ int mt76x02_set_rts_threshold(struct ieee80211_hw *hw, u32 val) 
		return -EINVAL;



	mutex_lock(&dev->mt76.mutex);

	mt76x02_mac_set_tx_protection(dev, val);

	mt76x02_mac_set_rts_thresh(dev, val);

	mutex_unlock(&dev->mt76.mutex);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE