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

diff --git a/drivers/net/wireless/realtek/rtw89/regd.c b/drivers/net/wireless/realtek/rtw89/regd.c
index d0857ef..85a7f90 100644 (file)
--- 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",