Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mt76: mt76x02: remove enable from mt76x02_edcca_init signature 



Remove enable parameter from mt76x02_edcca_init routine signature since
it is always true

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

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef) 
	mt76_rr(dev, MT_CH_IDLE);

	mt76_rr(dev, MT_CH_BUSY);



	mt76x02_edcca_init(dev, true);

	mt76x02_edcca_init(dev);



	if (mt76_is_mmio(dev)) {

		mt76x02_dfs_init_params(dev);

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

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ mt76_edcca_set(void *data, u64 val) 
	dev->ed_monitor_enabled = !!val;

	dev->ed_monitor = dev->ed_monitor_enabled &&

			  region == NL80211_DFS_ETSI;

	mt76x02_edcca_init(dev, true);

	mt76x02_edcca_init(dev);



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ mt76x02_dfs_set_domain(struct mt76x02_dev *dev, 


		dev->ed_monitor = dev->ed_monitor_enabled &&

				  region == NL80211_DFS_ETSI;

		mt76x02_edcca_init(dev, true);

		mt76x02_edcca_init(dev);



		dfs_pd->region = region;

		mt76x02_dfs_init_params(dev);

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

+2 −2
Original line number Diff line number Diff line
@@ -945,12 +945,12 @@ mt76x02_edcca_tx_enable(struct mt76x02_dev *dev, bool enable) 
	dev->ed_tx_blocked = !enable;

}



void mt76x02_edcca_init(struct mt76x02_dev *dev, bool enable)

void mt76x02_edcca_init(struct mt76x02_dev *dev)

{

	dev->ed_trigger = 0;

	dev->ed_silent = 0;



	if (dev->ed_monitor && enable) {

	if (dev->ed_monitor) {

		struct ieee80211_channel *chan = dev->mt76.chandef.chan;

		u8 ed_th = chan->band == NL80211_BAND_5GHZ ? 0x0e : 0x20;

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

+1 −1
Original line number Diff line number Diff line
@@ -209,5 +209,5 @@ int mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx, 
void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,

				   struct ieee80211_vif *vif, bool val);



void mt76x02_edcca_init(struct mt76x02_dev *dev, bool enable);

void mt76x02_edcca_init(struct mt76x02_dev *dev);

#endif