From: greearb@candelatech.com
To: linux-wireless@vger.kernel.org
Cc: Ben Greear <greearb@candelatech.com>,
Rubio Lu <Rubio-DW.Lu@mediatek.com>
Subject: [PATCH v3 1/2] mt76: mt7915: fix STA mode connection on DFS channels
Date: Fri, 20 Aug 2021 13:35:30 -0700 [thread overview]
Message-ID: <20210820203531.20706-1-greearb@candelatech.com> (raw)
From: Ben Greear <greearb@candelatech.com>
Only AP, adhoc and mesh mode needs to check CAC.
Stations, in particular, do not need this check.
Signed-off-by: Rubio Lu <Rubio-DW.Lu@mediatek.com>
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
v3: Fix typo in SOB in 1/2, fix rebase typo in 2/2,
split long line in 2/2
.../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
next reply other threads:[~2021-08-20 20:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-20 20:35 greearb [this message]
2021-08-20 20:35 ` [PATCH v3 2/2] mt76: mt7915: fix radar detector logic greearb
2021-11-10 20:32 ` Ben Greear
2021-11-10 22:36 ` Janusz Dziedzic
2021-08-29 18:17 ` [PATCH v3 1/2] mt76: mt7915: fix STA mode connection on DFS channels Janusz Dziedzic
2021-08-30 22:38 ` Ben Greear
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210820203531.20706-1-greearb@candelatech.com \
--to=greearb@candelatech.com \
--cc=Rubio-DW.Lu@mediatek.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.