Kaynağa Gözat

qcacld-3.0: Remove wlan_reg_set_channel_params

Remove wlan_reg_set_channel_params in cld code

Change-Id: Iacfe58a3f1681a4fad37536fcf688cc21043f6e8
CRs-Fixed: 2883768
Amruta Kulkarni 4 yıl önce
ebeveyn
işleme
6f628d4a5c

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

@@ -2194,8 +2194,9 @@ hdd_update_reg_chan_info(struct hdd_adapter *adapter,
 
 		if (WLAN_REG_IS_5GHZ_CH_FREQ(freq_list[i])) {
 			ch_params.ch_width = sap_config->acs_cfg.ch_width;
-			wlan_reg_set_channel_params(hdd_ctx->pdev, chan,
-						    0, &ch_params);
+			wlan_reg_set_channel_params_for_freq(hdd_ctx->pdev,
+							     icv->freq,
+							     0, &ch_params);
 			icv->vht_center_freq_seg0 = ch_params.center_freq_seg0;
 			icv->vht_center_freq_seg1 = ch_params.center_freq_seg1;
 		}

+ 15 - 12
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c

@@ -2017,8 +2017,9 @@ static QDF_STATUS lim_process_csa_wbw_ie(struct mac_context *mac_ctx,
 			 fw_vht_ch_wd);
 		ap_new_ch_width = fw_vht_ch_wd;
 		ch_params.ch_width = ap_new_ch_width;
-		wlan_reg_set_channel_params(mac_ctx->pdev,
-					    csa_params->channel, 0, &ch_params);
+		wlan_reg_set_channel_params_for_freq(mac_ctx->pdev,
+						     csa_params->csa_chan_freq,
+						     0, &ch_params);
 		ap_new_ch_width = ch_params.ch_width;
 		csa_params->new_ch_freq_seg1 = ch_params.center_freq_seg0;
 		csa_params->new_ch_freq_seg2 = ch_params.center_freq_seg1;
@@ -2082,7 +2083,6 @@ void lim_handle_csa_offload_msg(struct mac_context *mac_ctx,
 	struct ch_params ch_params = {0};
 	uint32_t channel_bonding_mode;
 	uint8_t country_code[CDS_COUNTRY_CODE_LEN + 1];
-
 	tLimWiderBWChannelSwitchInfo *chnl_switch_info = NULL;
 	tLimChannelSwitchInfo *lim_ch_switch = NULL;
 
@@ -2174,8 +2174,9 @@ void lim_handle_csa_offload_msg(struct mac_context *mac_ctx,
 			if (chnl_switch_info->newChanWidth) {
 				ch_params.ch_width =
 					chnl_switch_info->newChanWidth;
-				wlan_reg_set_channel_params(mac_ctx->pdev,
-					csa_params->channel, 0, &ch_params);
+				wlan_reg_set_channel_params_for_freq(mac_ctx->pdev,
+								     csa_params->csa_chan_freq,
+								     0, &ch_params);
 				lim_ch_switch->sec_ch_offset =
 					ch_params.sec_ch_offset;
 				session_entry->htSupportedChannelWidthSet =
@@ -2245,8 +2246,9 @@ void lim_handle_csa_offload_msg(struct mac_context *mac_ctx,
 			lim_ch_switch->state =
 				eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY;
 			ch_params.ch_width = CH_WIDTH_40MHZ;
-			wlan_reg_set_channel_params(mac_ctx->pdev,
-					csa_params->channel, 0, &ch_params);
+			wlan_reg_set_channel_params_for_freq(mac_ctx->pdev,
+							     csa_params->csa_chan_freq,
+							     0, &ch_params);
 			lim_ch_switch->sec_ch_offset =
 				ch_params.sec_ch_offset;
 			chnl_switch_info->newChanWidth = CH_WIDTH_40MHZ;
@@ -2279,9 +2281,9 @@ void lim_handle_csa_offload_msg(struct mac_context *mac_ctx,
 					CH_WIDTH_40MHZ;
 				ch_params.ch_width =
 					chnl_switch_info->newChanWidth;
-				wlan_reg_set_channel_params(mac_ctx->pdev,
-						csa_params->channel,
-						0, &ch_params);
+				wlan_reg_set_channel_params_for_freq(mac_ctx->pdev,
+								     csa_params->csa_chan_freq,
+								     0, &ch_params);
 				lim_ch_switch->ch_center_freq_seg0 =
 					ch_params.center_freq_seg0;
 				lim_ch_switch->sec_ch_offset =
@@ -2304,8 +2306,9 @@ void lim_handle_csa_offload_msg(struct mac_context *mac_ctx,
 			lim_ch_switch->state =
 				eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY;
 			ch_params.ch_width = CH_WIDTH_40MHZ;
-			wlan_reg_set_channel_params(mac_ctx->pdev,
-					csa_params->channel, 0, &ch_params);
+			wlan_reg_set_channel_params_for_freq(mac_ctx->pdev,
+							     csa_params->csa_chan_freq,
+							     0, &ch_params);
 			lim_ch_switch->ch_center_freq_seg0 =
 				ch_params.center_freq_seg0;
 			lim_ch_switch->sec_ch_offset =