diff --git a/umac/regulatory/core/src/reg_services_common.c b/umac/regulatory/core/src/reg_services_common.c index da03f8e538a1..f9b5448195cb 100644 --- a/umac/regulatory/core/src/reg_services_common.c +++ b/umac/regulatory/core/src/reg_services_common.c @@ -1160,16 +1160,7 @@ static enum channel_state reg_get_5g_bonded_chan_array( return chan_state; } -/** - * reg_get_5g_bonded_channel() - get the 5G bonded channel state - * @pdev: Pointer to pdev structure - * @chan_num: channel number - * @ch_width: channel width - * @bonded_chan_ptr_ptr: bonded channel ptr ptr - * - * Return: channel state - */ -static enum channel_state reg_get_5g_bonded_channel( +enum channel_state reg_get_5g_bonded_channel( struct wlan_objmgr_pdev *pdev, uint32_t chan_num, enum phy_ch_width ch_width, const struct bonded_channel **bonded_chan_ptr_ptr) diff --git a/umac/regulatory/core/src/reg_services_common.h b/umac/regulatory/core/src/reg_services_common.h index dc143db77efa..97cadcb5d58e 100644 --- a/umac/regulatory/core/src/reg_services_common.h +++ b/umac/regulatory/core/src/reg_services_common.h @@ -134,6 +134,20 @@ QDF_STATUS reg_get_channel_list_with_power(struct wlan_objmgr_pdev *pdev, enum channel_state reg_get_channel_state(struct wlan_objmgr_pdev *pdev, uint32_t ch); +/** + * reg_get_5g_bonded_channel() - get the 5G bonded channel state + * @pdev: Pointer to pdev structure + * @chan_num: channel number + * @ch_width: channel width + * @bonded_chan_ptr_ptr: bonded channel ptr ptr + * + * Return: channel state + */ +enum channel_state reg_get_5g_bonded_channel( + struct wlan_objmgr_pdev *pdev, uint32_t chan_num, + enum phy_ch_width ch_width, + const struct bonded_channel **bonded_chan_ptr_ptr); + /** * reg_get_5g_bonded_channel_state() - Get channel state for 5G bonded channel * @pdev: Pointer to pdev diff --git a/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h b/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h index b16a764c77f7..1f29f9efaec8 100644 --- a/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h +++ b/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h @@ -380,6 +380,19 @@ enum channel_enum wlan_reg_get_chan_enum(uint32_t chan_num); enum channel_state wlan_reg_get_channel_state(struct wlan_objmgr_pdev *pdev, uint32_t ch); +/** + * wlan_reg_get_5g_bonded_channel_and_state() - Get 5G bonded channel and state + * @ch: channel number. + * @bw: channel band width + * @bonded_chan_ptr_ptr: bonded channel ptr ptr + * + * Return: channel state + */ +enum channel_state wlan_reg_get_5g_bonded_channel_and_state( + struct wlan_objmgr_pdev *pdev, uint8_t ch, + enum phy_ch_width bw, + const struct bonded_channel **bonded_chan_ptr_ptr); + /** * wlan_reg_get_5g_bonded_channel_state() - Get 5G bonded channel state * @pdev: The physical dev to program country code or regdomain diff --git a/umac/regulatory/dispatcher/src/wlan_reg_services_api.c b/umac/regulatory/dispatcher/src/wlan_reg_services_api.c index e4802efb9b35..d6c4720f2024 100644 --- a/umac/regulatory/dispatcher/src/wlan_reg_services_api.c +++ b/umac/regulatory/dispatcher/src/wlan_reg_services_api.c @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -105,6 +106,19 @@ wlan_reg_chan_has_dfs_attribute(struct wlan_objmgr_pdev *pdev, uint32_t ch) return reg_chan_has_dfs_attribute(pdev, ch); } +enum channel_state wlan_reg_get_5g_bonded_channel_and_state( + struct wlan_objmgr_pdev *pdev, uint8_t ch, + enum phy_ch_width bw, + const struct bonded_channel **bonded_chan_ptr_ptr) +{ + /* + * Get channel and state from regulatory + */ + return reg_get_5g_bonded_channel(pdev, ch, bw, bonded_chan_ptr_ptr); +} + +qdf_export_symbol(wlan_reg_get_5g_bonded_channel_and_state); + /** * wlan_reg_get_5g_bonded_channel_state() - Get 5G bonded channel state * @ch: channel number. @@ -212,6 +226,8 @@ uint16_t wlan_reg_get_bw_value(enum phy_ch_width bw) return reg_get_bw_value(bw); } +qdf_export_symbol(wlan_reg_get_bw_value); + #ifdef CONFIG_CHAN_NUM_API /** * wlan_reg_get_bonded_channel_state() - Get 2G bonded channel state @@ -491,12 +507,16 @@ uint32_t wlan_reg_freq_to_chan(struct wlan_objmgr_pdev *pdev, return reg_freq_to_chan(pdev, freq); } +qdf_export_symbol(wlan_reg_freq_to_chan); + uint32_t wlan_reg_chan_to_freq(struct wlan_objmgr_pdev *pdev, uint32_t chan_num) { return reg_chan_to_freq(pdev, chan_num); } +qdf_export_symbol(wlan_reg_chan_to_freq); + #ifdef CONFIG_CHAN_NUM_API bool wlan_reg_chan_is_49ghz(struct wlan_objmgr_pdev *pdev, uint8_t chan_num)