Bladeren bron

qcacmn: Change visibility of the API reg_get_6g_pwrmode_chan_list

The reg_get_6g_pwrmode_chan_list() is a static API and is needed to be
called outside converged code.

Change the visibility of the API and make it global.

Change-Id: Id0846e65262a8d8c41bfd19dac2c373e65e677b5
CRs-Fixed: 3478450
Vignesh U 2 jaren geleden
bovenliggende
commit
b70c7e84e5
2 gewijzigde bestanden met toevoegingen van 28 en 10 verwijderingen
  1. 1 10
      umac/regulatory/core/src/reg_build_chan_list.c
  2. 27 0
      umac/regulatory/core/src/reg_build_chan_list.h

+ 1 - 10
umac/regulatory/core/src/reg_build_chan_list.c

@@ -3487,7 +3487,7 @@ reg_copy_from_super_chan_info_to_reg_channel(struct regulatory_channel *chan,
 	chan->psd_eirp = sc_entry.reg_chan_pwr[in_6g_pwr_mode].psd_eirp;
 }
 
-static QDF_STATUS
+QDF_STATUS
 reg_get_6g_pwrmode_chan_list(struct wlan_regulatory_pdev_priv_obj
 			     *pdev_priv_obj,
 			     struct regulatory_channel *chan_list,
@@ -3521,15 +3521,6 @@ reg_populate_6g_band_channels(struct cur_reg_rule *reg_rule_5g,
 			      struct regulatory_channel *mas_chan_list)
 {
 }
-
-static inline QDF_STATUS
-reg_get_6g_pwrmode_chan_list(struct wlan_regulatory_pdev_priv_obj
-			     *pdev_priv_obj,
-			     struct regulatory_channel *chan_list,
-			     enum supported_6g_pwr_types in_6g_pwr_mode)
-{
-	return QDF_STATUS_E_INVAL;
-}
 #endif /* CONFIG_BAND_6GHZ */
 
 QDF_STATUS reg_get_pwrmode_chan_list(struct wlan_objmgr_pdev *pdev,

+ 27 - 0
umac/regulatory/core/src/reg_build_chan_list.h

@@ -259,6 +259,24 @@ reg_copy_from_super_chan_info_to_reg_channel(struct regulatory_channel *chan,
  */
 void reg_set_ap_pwr_type(struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj);
 
+/**
+ * reg_get_6g_pwrmode_chan_list() - Get the modified channel list. The modified
+ * current channel list consists of 2G and 5G portions of the current channel
+ * list and the 6G portion of the current channel list is derived from the input
+ * 6g power type.
+ * @pdev_priv_obj: Pointer to pdev private object.
+ * @chan_list: channel list pointer
+ * @in_6g_pwr_mode: Input 6GHz power mode.
+ *
+ * Return:
+ * QDF_STATUS_SUCCESS: Success
+ * QDF_STATUS_E_INVAL: Failed to get channel list
+ */
+QDF_STATUS
+reg_get_6g_pwrmode_chan_list(struct wlan_regulatory_pdev_priv_obj
+			     *pdev_priv_obj,
+			     struct regulatory_channel *chan_list,
+			     enum supported_6g_pwr_types in_6g_pwr_mode);
 #else /* CONFIG_BAND_6GHZ */
 static inline QDF_STATUS
 reg_get_6g_ap_master_chan_list(struct wlan_objmgr_pdev *pdev,
@@ -319,6 +337,15 @@ static inline void
 reg_set_ap_pwr_type(struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj)
 {
 }
+
+static inline QDF_STATUS
+reg_get_6g_pwrmode_chan_list(struct wlan_regulatory_pdev_priv_obj
+			     *pdev_priv_obj,
+			     struct regulatory_channel *chan_list,
+			     enum supported_6g_pwr_types in_6g_pwr_mode)
+{
+	return QDF_STATUS_E_INVAL;
+}
 #endif /* CONFIG_BAND_6GHZ */
 /**
  * reg_process_master_chan_list() - Compute master channel list based on the