summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZong-Zhe Yang <kevin_yang@realtek.com>2024-04-12 19:57:26 +0800
committerPing-Ke Shih <pkshih@realtek.com>2024-04-18 09:09:56 +0800
commit01e67a62fd3070d49e0110888df515827c99a6fd (patch)
tree6c77889666790b0ffa7fac8064a27a79199621ac
parent969efe4ef8376d850410ca4370e73d49cfa4fb15 (diff)
wifi: rtw89: regd: block 6 GHz by policy if not specific country
We allow 6 GHz on target regd if and only if 1. it is a specific country, i.e. not any world-wide cases 2. its 6 GHz is not blocked So, for world-wide cases, their 6 GHz will be blocked now. Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Link: https://msgid.link/20240412115729.8316-6-pkshih@realtek.com
-rw-r--r--drivers/net/wireless/realtek/rtw89/regd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/realtek/rtw89/regd.c b/drivers/net/wireless/realtek/rtw89/regd.c
index d0857ef60ea6..85a7f902ccf9 100644
--- a/drivers/net/wireless/realtek/rtw89/regd.c
+++ b/drivers/net/wireless/realtek/rtw89/regd.c
@@ -572,10 +572,8 @@ static void rtw89_regd_apply_policy_6ghz(struct rtw89_dev *rtwdev,
int i;
index = rtw89_regd_get_index(regd);
- if (index == RTW89_REGD_MAX_COUNTRY_NUM)
- return;
-
- if (!test_bit(index, regulatory->block_6ghz))
+ if (index != RTW89_REGD_MAX_COUNTRY_NUM &&
+ !test_bit(index, regulatory->block_6ghz))
return;
rtw89_debug(rtwdev, RTW89_DBG_REGD, "%c%c 6 GHz is blocked by policy\n",