samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Fix ETSI reg_domain for SRD channels

Browse Source 
Currently, only ETSI13 check is present for SRD channels but
ETSI18 and ETSI20 are also added for SRD channels.

Add a check of ETSI18 and ETSI20 to remove SRD channels

Change-Id: I3bd7c9d9d2ff26f6f625fc70f1ca89cb39634dfb
CRs-Fixed: 3614070
This commit is contained in:
Jyoti Kumari
2023-09-12 18:44:18 +05:30
committed by Rahul Choudhary
parent 13e4f87d48
commit 81a448455b
8 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
umac/regulatory/dispatcher/inc/wlan_reg_services_api.h
View File

@@ -638,34 +638,36 @@ wlan_reg_get_best_6g_power_type(struct wlan_objmgr_psoc *psoc,
#ifdef CONFIG_CHAN_FREQ_API
/**
* wlan_reg_is_etsi13_srd_chan_for_freq() - Checks if the ch is ETSI13 srd ch
* wlan_reg_is_etsi_srd_chan_for_freq() - Checks if the ch is
* ETSI13/ETSI18/ETSI20 srd ch
* or not
* @pdev: pdev ptr
* @freq: channel center frequency
*
* Return: true or false
*/
bool wlan_reg_is_etsi13_srd_chan_for_freq(struct wlan_objmgr_pdev *pdev,
qdf_freq_t freq);
bool wlan_reg_is_etsi_srd_chan_for_freq(struct wlan_objmgr_pdev *pdev,
qdf_freq_t freq);
#endif /*CONFIG_CHAN_FREQ_API*/
/**
* wlan_reg_is_etsi13_regdmn() - Checks if current reg domain is ETSI13 or not
* wlan_reg_is_etsi_regdmn() - Check if current reg domain is
* ETSI13/ETSI18/ETSI20 or not
* @pdev: pdev ptr
*
* Return: true or false
*/
bool wlan_reg_is_etsi13_regdmn(struct wlan_objmgr_pdev *pdev);
bool wlan_reg_is_etsi_regdmn(struct wlan_objmgr_pdev *pdev);
/**
* wlan_reg_is_etsi13_srd_chan_allowed_master_mode() - Checks if regdmn is
* wlan_reg_is_etsi_srd_chan_allowed_master_mode() - Checks if regdmn is
* ETSI13 and SRD channels are allowed in master mode or not.
*
* @pdev: pdev ptr
*
* Return: true or false
*/
bool wlan_reg_is_etsi13_srd_chan_allowed_master_mode(struct wlan_objmgr_pdev
bool wlan_reg_is_etsi_srd_chan_allowed_master_mode(struct wlan_objmgr_pdev
*pdev);
#endif

14
umac/regulatory/dispatcher/src/wlan_reg_services_api.c
View File

@@ -710,15 +710,15 @@ bool wlan_reg_11d_enabled_on_host(struct wlan_objmgr_psoc *psoc)
return reg_11d_enabled_on_host(psoc);
}
bool wlan_reg_is_etsi13_regdmn(struct wlan_objmgr_pdev *pdev)
bool wlan_reg_is_etsi_regdmn(struct wlan_objmgr_pdev *pdev)
{
return reg_is_etsi13_regdmn(pdev);
return reg_is_etsi_regdmn(pdev);
}
bool wlan_reg_is_etsi13_srd_chan_allowed_master_mode(struct wlan_objmgr_pdev
bool wlan_reg_is_etsi_srd_chan_allowed_master_mode(struct wlan_objmgr_pdev
*pdev)
{
return reg_is_etsi13_srd_chan_allowed_master_mode(pdev);
return reg_is_etsi_srd_chan_allowed_master_mode(pdev);
}
bool wlan_reg_is_6ghz_band_set(struct wlan_objmgr_pdev *pdev)
@@ -1075,10 +1075,10 @@ bool wlan_reg_is_freq_present_in_cur_chan_list(struct wlan_objmgr_pdev *pdev,
return reg_is_freq_present_in_cur_chan_list(pdev, freq);
}
bool wlan_reg_is_etsi13_srd_chan_for_freq(struct wlan_objmgr_pdev *pdev,
qdf_freq_t freq)
bool wlan_reg_is_etsi_srd_chan_for_freq(struct wlan_objmgr_pdev *pdev,
qdf_freq_t freq)
{
return reg_is_etsi13_srd_chan_for_freq(pdev, freq);
return reg_is_etsi_srd_chan_for_freq(pdev, freq);
}
bool wlan_reg_is_dsrc_freq(qdf_freq_t freq)