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

mt76: move nl80211_dfs_regions in mt76_dev data structure 



Move dfs region field in mt76_dev data structure since it is
used by all drivers. This is a preliminary patch to add DFS support to
mt7615 driver

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

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

+2 −0
Original line number Diff line number Diff line
@@ -486,6 +486,8 @@ struct mt76_dev { 
	int txpower_conf;

	int txpower_cur;



	enum nl80211_dfs_regions region;



	u32 debugfs_reg;



	struct led_classdev led_cdev;

drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ mt7603_edcca_set(void *data, u64 val) 


	dev->ed_monitor_enabled = !!val;

	dev->ed_monitor = dev->ed_monitor_enabled &&

			  dev->region == NL80211_DFS_ETSI;

			  dev->mt76.region == NL80211_DFS_ETSI;

	mt7603_init_edcca(dev);



	mutex_unlock(&dev->mt76.mutex);

drivers/net/wireless/mediatek/mt76/mt7603/init.c

+2 −2
Original line number Diff line number Diff line
@@ -445,9 +445,9 @@ mt7603_regd_notifier(struct wiphy *wiphy, 
	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);

	struct mt7603_dev *dev = hw->priv;



	dev->region = request->dfs_region;

	dev->mt76.region = request->dfs_region;

	dev->ed_monitor = dev->ed_monitor_enabled &&

			  dev->region == NL80211_DFS_ETSI;

			  dev->mt76.region == NL80211_DFS_ETSI;

}



static int

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

+0 −2
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ struct mt7603_dev { 


	u8 mcu_running;



	enum nl80211_dfs_regions region;



	u8 ed_monitor_enabled;

	u8 ed_monitor;

	s8 ed_trigger;

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

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int 
mt76_edcca_set(void *data, u64 val)

{

	struct mt76x02_dev *dev = data;

	enum nl80211_dfs_regions region = dev->dfs_pd.region;

	enum nl80211_dfs_regions region = dev->mt76.region;



	mutex_lock(&dev->mt76.mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE