| Message ID | 20231004085051.205683-2-pkshih@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0c1784cbe62fe4a0dc14b7d36f78a26a647b003b |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: rtw88: update TX power along with regulations especially China | expand |
Ping-Ke Shih <pkshih@realtek.com> wrote: > From: Zong-Zhe Yang <kevin_yang@realtek.com> > > In newer Realtek parameter package, Realtek regd can configure > QATAR and UK individually. So, driver extends the regd enum. > Besides, driver configure alternative of them which will be > referenced when parameter package of a chip doesn't consider > QATAR and UK individually. > > Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com> > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> 5 patches applied to wireless-next.git, thanks. 0c1784cbe62f wifi: rtw88: regd: configure QATAR and UK 5995ec73ef2c wifi: rtw88: 8821c: update TX power limit to V67 9c2651f6a9ba wifi: rtw88: 8822c: update TX power limit to V70 02f697ab2213 wifi: rtw88: regd: update regulatory map to R64-R42 14a5b11532e8 wifi: rtw88: 8821c: tweak CCK TX filter setting for SRRC regulation
diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h index c42ef8294d59..86dc1516effa 100644 --- a/drivers/net/wireless/realtek/rtw88/main.h +++ b/drivers/net/wireless/realtek/rtw88/main.h @@ -342,8 +342,10 @@ enum rtw_regulatory_domains { RTW_REGD_UKRAINE = 7, RTW_REGD_MEXICO = 8, RTW_REGD_CN = 9, - RTW_REGD_WW, + RTW_REGD_QATAR = 10, + RTW_REGD_UK = 11, + RTW_REGD_WW, RTW_REGD_MAX }; diff --git a/drivers/net/wireless/realtek/rtw88/regd.c b/drivers/net/wireless/realtek/rtw88/regd.c index 2f547cbcf6da..680d8f32fce6 100644 --- a/drivers/net/wireless/realtek/rtw88/regd.c +++ b/drivers/net/wireless/realtek/rtw88/regd.c @@ -519,6 +519,8 @@ rtw_regd_alt[RTW_REGD_MAX] = { DECL_REGD_ALT(RTW_REGD_UKRAINE, RTW_REGD_ETSI), DECL_REGD_ALT(RTW_REGD_MEXICO, RTW_REGD_FCC), DECL_REGD_ALT(RTW_REGD_CN, RTW_REGD_ETSI), + DECL_REGD_ALT(RTW_REGD_QATAR, RTW_REGD_ETSI), + DECL_REGD_ALT(RTW_REGD_UK, RTW_REGD_ETSI), }; bool rtw_regd_has_alt(u8 regd, u8 *regd_alt)