From fd1fa6860666cdf81cfd38810d9fe07940debbe4 Mon Sep 17 00:00:00 2001 From: Lorenzo Bianconi Date: Tue, 7 Jan 2020 14:59:34 +0100 Subject: [PATCH] mt76: move WIPHY_FLAG_HAS_CHANNEL_SWITCH in mt76_phy_init Move WIPHY_FLAG_HAS_CHANNEL_SWITCH in mt76-core module since now all drivers support Channel Switch Announcement Signed-off-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau --- mac80211.c | 1 + mt7603/init.c | 1 - mt7615/init.c | 1 - mt76x02_util.c | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/mac80211.c b/mac80211.c index c5aa635f..a4881bf0 100644 --- a/mac80211.c +++ b/mac80211.c @@ -279,6 +279,7 @@ mt76_phy_init(struct mt76_dev *dev, struct ieee80211_hw *hw) SET_IEEE80211_PERM_ADDR(hw, dev->macaddr); wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR; + wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH; wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST); wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_AIRTIME_FAIRNESS); diff --git a/mt7603/init.c b/mt7603/init.c index 32fdb81b..182ce5a8 100644 --- a/mt7603/init.c +++ b/mt7603/init.c @@ -564,7 +564,6 @@ int mt7603_register_device(struct mt7603_dev *dev) dev->mt76.led_cdev.blink_set = mt7603_led_set_blink; } - wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH; wiphy->reg_notifier = mt7603_regd_notifier; ret = mt76_register_device(&dev->mt76, true, mt7603_rates, diff --git a/mt7615/init.c b/mt7615/init.c index 33515037..d9b455f7 100644 --- a/mt7615/init.c +++ b/mt7615/init.c @@ -347,7 +347,6 @@ mt7615_init_wiphy(struct ieee80211_hw *hw) wiphy->iface_combinations = if_comb; wiphy->n_iface_combinations = ARRAY_SIZE(if_comb); wiphy->reg_notifier = mt7615_regd_notifier; - wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH; wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS); diff --git a/mt76x02_util.c b/mt76x02_util.c index 8222b00d..b215da87 100644 --- a/mt76x02_util.c +++ b/mt76x02_util.c @@ -175,7 +175,6 @@ void mt76x02_init_device(struct mt76x02_dev *dev) } } - wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH; wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS); hw->sta_data_size = sizeof(struct mt76x02_sta);