From: Ben Greear <[email protected]>
Only AP, adhoc and mesh mode needs to check CAC.
Stations, in particular, do not need this check.
Signed-off-by: Rubio Lu <[email protected]>
Singed-off-by: Ben Greear <[email protected]>
---
v2: Take adhoc and mesh mode into account as well.
.../net/wireless/mediatek/mt76/mt7915/mac.c | 38 +++++++++++++++++--
1 file changed, 35 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 8747e452e114..a6e142d27b60 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -2455,6 +2455,32 @@ static int mt7915_dfs_start_radar_detector(struct mt7915_phy *phy)
return 0;
}
+struct mt7915_vif_counts {
+ u32 mesh;
+ u32 adhoc;
+ u32 ap;
+};
+
+static void
+mt7915_vif_counts(void *priv, u8 *mac, struct ieee80211_vif *vif)
+{
+ struct mt7915_vif_counts *counts = priv;
+
+ switch (vif->type) {
+ case NL80211_IFTYPE_ADHOC:
+ counts->adhoc++;
+ break;
+ case NL80211_IFTYPE_MESH_POINT:
+ counts->mesh++;
+ break;
+ case NL80211_IFTYPE_AP:
+ counts->ap++;
+ break;
+ default:
+ break;
+ }
+}
+
static int
mt7915_dfs_init_radar_specs(struct mt7915_phy *phy)
{
@@ -2495,6 +2521,7 @@ int mt7915_dfs_init_radar_detector(struct mt7915_phy *phy)
struct mt7915_dev *dev = phy->dev;
bool ext_phy = phy != &dev->phy;
int err;
+ struct mt7915_vif_counts counts = {0};
if (dev->mt76.region == NL80211_DFS_UNSET) {
phy->dfs_state = -1;
@@ -2519,9 +2546,14 @@ int mt7915_dfs_init_radar_detector(struct mt7915_phy *phy)
phy->dfs_state = chandef->chan->dfs_state;
if (chandef->chan->flags & IEEE80211_CHAN_RADAR) {
- if (chandef->chan->dfs_state != NL80211_DFS_AVAILABLE)
- return mt7915_dfs_start_radar_detector(phy);
-
+ if (chandef->chan->dfs_state != NL80211_DFS_AVAILABLE) {
+ ieee80211_iterate_active_interfaces(phy->mt76->hw,
+ IEEE80211_IFACE_ITER_RESUME_ALL,
+ mt7915_vif_counts, &counts);
+ if (counts.ap + counts.adhoc + counts.mesh)
+ mt7915_dfs_start_radar_detector(phy);
+ return 0;
+ }
return mt7915_mcu_rdd_cmd(dev, RDD_CAC_END, ext_phy,
MT_RX_SEL0, 0);
}
--
2.20.1