Browse Source

qcacld-3.0: Don't use utils_dfs_mark_leaking_ch()

As part of regulatory cleanup, remove utils_dfs_mark_leaking_ch()

Use utils_dfs_mark_leaking_chan_for_freq() instead of
utils_dfs_mark_leaking_ch()

Change-Id: I796de0abb50fdbdf9d61768a190553e031a7989e
CRs-Fixed: 2972007
Jyoti Kumari 3 years ago
parent
commit
486100d756
3 changed files with 10 additions and 14 deletions
  1. 2 6
      core/hdd/src/wlan_hdd_cfg80211.c
  2. 2 2
      core/sap/inc/sap_api.h
  3. 6 6
      core/sap/src/sap_module.c

+ 2 - 6
core/hdd/src/wlan_hdd_cfg80211.c

@@ -13205,14 +13205,10 @@ static int __wlan_hdd_cfg80211_setband(struct wiphy *wiphy,
 static QDF_STATUS wlan_hdd_validate_acs_channel(struct hdd_adapter *adapter,
 						uint32_t chan_freq, int chan_bw)
 {
-	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	uint8_t channel;
-
 	if (QDF_STATUS_SUCCESS !=
 	    wlan_hdd_validate_operation_channel(adapter, chan_freq))
 		return QDF_STATUS_E_FAILURE;
 
-	channel = (uint8_t)wlan_reg_freq_to_chan(hdd_ctx->pdev, chan_freq);
 	if ((wlansap_is_channel_in_nol_list(WLAN_HDD_GET_SAP_CTX_PTR(adapter),
 				chan_freq,
 				PHY_SINGLE_CHANNEL_CENTERED))) {
@@ -13222,8 +13218,8 @@ static QDF_STATUS wlan_hdd_validate_acs_channel(struct hdd_adapter *adapter,
 
 	if ((wlansap_is_channel_leaking_in_nol(
 				WLAN_HDD_GET_SAP_CTX_PTR(adapter),
-				channel, chan_bw))) {
-		hdd_info("channel %d is leaking in nol", channel);
+				chan_freq, chan_bw))) {
+		hdd_info("channel freq %d is leaking in nol", chan_freq);
 		return -EINVAL;
 	}
 

+ 2 - 2
core/sap/inc/sap_api.h

@@ -797,13 +797,13 @@ bool wlansap_is_channel_in_nol_list(struct sap_context *sap_ctx,
  * wlansap_is_channel_leaking_in_nol() - This API checks if channel is leaking
  * in nol list
  * @sap_ctx: SAP context pointer
- * @channel: channel
+ * @chan_freq: channel frequency
  * @chan_bw: channel bandwidth
  *
  * Return: True/False
  */
 bool wlansap_is_channel_leaking_in_nol(struct sap_context *sap_ctx,
-				       uint8_t channel,
+				       uint16_t chan_freq,
 				       uint8_t chan_bw);
 
 /**

+ 6 - 6
core/sap/src/sap_module.c

@@ -419,22 +419,22 @@ bool wlansap_is_channel_in_nol_list(struct sap_context *sap_ctx,
 }
 
 static QDF_STATUS wlansap_mark_leaking_channel(struct wlan_objmgr_pdev *pdev,
-		uint8_t *leakage_adjusted_lst,
+		uint16_t *leakage_adjusted_lst,
 		uint8_t chan_bw)
 {
 
-	return utils_dfs_mark_leaking_ch(pdev, chan_bw, 1,
-			leakage_adjusted_lst);
+	return utils_dfs_mark_leaking_chan_for_freq(pdev, chan_bw, 1,
+						    leakage_adjusted_lst);
 }
 
 bool wlansap_is_channel_leaking_in_nol(struct sap_context *sap_ctx,
-				       uint8_t channel,
+				       uint16_t chan_freq,
 				       uint8_t chan_bw)
 {
 	struct mac_context *mac_ctx;
-	uint8_t leakage_adjusted_lst[1];
+	uint16_t leakage_adjusted_lst[1];
 
-	leakage_adjusted_lst[0] = channel;
+	leakage_adjusted_lst[0] = chan_freq;
 	mac_ctx = sap_get_mac_context();
 	if (!mac_ctx) {
 		sap_err("Invalid MAC context");