diff options
| author | Ming Yen Hsieh <mingyen.hsieh@mediatek.com> | 2025-10-31 12:03:52 +0300 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2025-11-24 16:37:55 +0300 |
| commit | 992c304112631498fd9bdc7d9bcf3840c12e304f (patch) | |
| tree | f4422780a781dfc6ebef85ea106287581772d262 | |
| parent | 3bc62aa4484dcb9529fea70e756743769b1145e6 (diff) | |
| download | linux-992c304112631498fd9bdc7d9bcf3840c12e304f.tar.xz | |
wifi: mt76: mt7925: disable auto regd changes after user set
Add regd_user flag to block automatic regulatory domain updates
if set by user.
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Link: https://patch.msgid.link/20251031090352.1400079-7-mingyen.hsieh@mediatek.com
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7925/regd.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt792x.h | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c index 54c4ab2f322c..b6ef9d9e5f7f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c @@ -685,6 +685,7 @@ static int mt7925_load_clc(struct mt792x_dev *dev, const char *fw_name) int ret, i, len, offset = 0; dev->phy.clc_chan_conf = 0xff; + dev->regd_user = false; if (!mt7925_regd_clc_supported(dev)) return 0; diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/regd.c b/drivers/net/wireless/mediatek/mt76/mt7925/regd.c index 4565e1132b36..292087e882d1 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/regd.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/regd.c @@ -173,6 +173,10 @@ void mt7925_regd_notifier(struct wiphy *wiphy, struct regulatory_request *req) struct mt76_connac_pm *pm = &dev->pm; struct mt76_dev *mdev = &dev->mt76; + if (req->initiator == NL80211_REGDOM_SET_BY_USER && + !dev->regd_user) + dev->regd_user = true; + /* allow world regdom at the first boot only */ if (!memcmp(req->alpha2, "00", 2) && mdev->alpha2[0] && mdev->alpha2[1]) @@ -224,7 +228,8 @@ int mt7925_regd_change(struct mt792x_phy *phy, char *alpha2) return 0; if (!mt7925_regd_is_valid_alpha2(alpha2) || - !mt7925_regd_clc_supported(dev)) + !mt7925_regd_clc_supported(dev) || + dev->regd_user) return -EINVAL; if (mdev->alpha2[0] != '0' && mdev->alpha2[1] != '0') diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h index ed2606e9251a..8388638ed550 100644 --- a/drivers/net/wireless/mediatek/mt76/mt792x.h +++ b/drivers/net/wireless/mediatek/mt76/mt792x.h @@ -231,6 +231,7 @@ struct mt792x_dev { bool hw_init_done:1; bool fw_assert:1; bool has_eht:1; + bool regd_user:1; bool regd_in_progress:1; bool aspm_supported:1; bool hif_idle:1; |