qcacld-3.0: refine the code for channel load request processing

Handle subelement Bandwidth-Indication and Wide-Bandwidth-Channel-Switch
separately when processing channel load request.
Fix some 'might-be-used-uninitialized' issues.

Change-Id: I8cb7cebc5ab3c9521693672e94180f5fec5e84a1
CRs-Fixed: 3669137

core/mac/src/pe/rrm/rrm_api.c

@@ -2061,8 +2061,8 @@ rrm_process_channel_load_req(struct mac_context *mac,
 {
 	struct scheduler_msg msg = {0};
 	struct ch_load_ind *load_ind;
-	struct bw_ind_element bw_ind;
-	struct wide_bw_chan_switch wide_bw;
+	struct bw_ind_element bw_ind = {0};
+	struct wide_bw_chan_switch wide_bw = {0};
 	struct rrm_reporting rrm_report;
 	uint8_t op_class, channel;
 	uint16_t randomization_intv, meas_duration, max_meas_duration;
@@ -2110,7 +2110,10 @@ rrm_process_channel_load_req(struct mac_context *mac,
 			pe_debug("Dropping req: invalid is_bw_ind_element IE");
 			return eRRM_REFUSED;
 		}
-	} else if (is_wide_bw_chan_switch) {
+	}
+
+	if (is_wide_bw_chan_switch) {
+		wide_bw.is_wide_bw_chan_switch = true;
 		wide_bw.channel_width = chan_load_req->measurement_request.channel_load.wide_bw_chan_switch.new_chan_width;
 		wide_bw.center_chan_freq0 = chan_load_req->measurement_request.channel_load.wide_bw_chan_switch.new_center_chan_freq0;
 		wide_bw.center_chan_freq1 = chan_load_req->measurement_request.channel_load.wide_bw_chan_switch.new_center_chan_freq1;
@@ -2118,12 +2121,10 @@ rrm_process_channel_load_req(struct mac_context *mac,
 			 wide_bw.channel_width, wide_bw.center_chan_freq0,
 			 wide_bw.center_chan_freq1);
 		if (wide_bw.channel_width < CH_WIDTH_20MHZ ||
-		    bw_ind.channel_width >= CH_WIDTH_320MHZ) {
+		    wide_bw.channel_width >= CH_WIDTH_320MHZ) {
 			pe_debug("Dropping req: invalid wide_bw IE");
 			return eRRM_REFUSED;
 		}
-	} else {
-		pe_debug("IE(s) are NULL in channel load request");
 	}
 
 	op_class = chan_load_req->measurement_request.channel_load.op_class;
@@ -2198,24 +2199,11 @@ rrm_process_channel_load_req(struct mac_context *mac,
 	load_ind->meas_duration = meas_duration;
 	curr_req->token = chan_load_req->measurement_token;
 
-	if (is_wide_bw_chan_switch) {
-		load_ind->wide_bw.is_wide_bw_chan_switch = true;
-		load_ind->wide_bw.channel_width = wide_bw.channel_width;
-		load_ind->wide_bw.center_chan_freq0 = wide_bw.center_chan_freq0;
-		load_ind->wide_bw.center_chan_freq1 = wide_bw.center_chan_freq1;
-	} else {
-		load_ind->wide_bw.channel_width = CH_WIDTH_INVALID;
-	}
+	if (is_wide_bw_chan_switch)
+		load_ind->wide_bw = wide_bw;
 
-	if (bw_ind.is_bw_ind_element) {
-		load_ind->bw_ind.is_bw_ind_element = true;
-		load_ind->bw_ind.channel_width = bw_ind.channel_width;
-		load_ind->bw_ind.ccfi0 = bw_ind.ccfi0;
-		load_ind->bw_ind.ccfi1 = bw_ind.ccfi1;
-		load_ind->bw_ind.center_freq = bw_ind.center_freq;
-	} else {
-		load_ind->bw_ind.is_bw_ind_element = false;
-	}
+	if (is_bw_ind)
+		load_ind->bw_ind = bw_ind;
 
 	/* Send request to SME. */
 	msg.type = eWNI_SME_CHAN_LOAD_REQ_IND;

core/sme/src/rrm/sme_rrm.c

@@ -1230,13 +1230,7 @@ sme_rrm_fill_freq_list_for_channel_load(struct mac_context *mac_ctx,
 
 	bw_ind = &sme_rrm_ctx->chan_load_req_info.bw_ind;
 	wide_bw = &sme_rrm_ctx->chan_load_req_info.wide_bw;
-
-	if (bw_ind->is_bw_ind_element) {
-		chan_width = bw_ind->channel_width;
-		cen320_freq = bw_ind->center_freq;
-	} else if (wide_bw->is_wide_bw_chan_switch){
-		chan_width = wide_bw->channel_width;
-	} else {
+	if (!bw_ind->is_bw_ind_element && !wide_bw->is_wide_bw_chan_switch) {
 		if (wlan_reg_is_6ghz_op_class(mac_ctx->pdev,
 					      sme_rrm_ctx->regClass))
 			c_space =
@@ -1274,6 +1268,14 @@ sme_rrm_fill_freq_list_for_channel_load(struct mac_context *mac_ctx,
 			sme_err("invalid chan_space: %d", c_space);
 			return QDF_STATUS_E_FAILURE;
 		}
+	} else {
+		if (bw_ind->is_bw_ind_element) {
+			chan_width = bw_ind->channel_width;
+			cen320_freq = bw_ind->center_freq;
+		}
+
+		if (wide_bw->is_wide_bw_chan_switch)
+			chan_width = wide_bw->channel_width;
 	}
 
 	sme_rrm_ctx->chan_load_req_info.req_chan_width = chan_width;
@@ -1390,6 +1392,7 @@ static QDF_STATUS sme_rrm_process_chan_load_req_ind(struct mac_context *mac,
 	struct ch_load_ind *chan_load;
 	tpRrmSMEContext sme_rrm_ctx;
 	tpRrmPEContext rrm_ctx;
+	struct channel_load_req_info *req_info;
 
 	chan_load = (struct ch_load_ind *)msg_buf;
 	sme_rrm_ctx = &mac->rrm.rrmSmeContext[chan_load->measurement_idx];
@@ -1406,27 +1409,27 @@ static QDF_STATUS sme_rrm_process_chan_load_req_ind(struct mac_context *mac,
 		     (uint8_t *)&chan_load->meas_duration,
 		     SIR_ESE_MAX_MEAS_IE_REQS);
 	sme_rrm_ctx->measurement_type = RRM_CHANNEL_LOAD;
-	sme_rrm_ctx->chan_load_req_info.channel = chan_load->channel;
-	sme_rrm_ctx->chan_load_req_info.req_freq = chan_load->req_freq;
+	req_info = &sme_rrm_ctx->chan_load_req_info;
+	req_info->channel = chan_load->channel;
+	req_info->req_freq = chan_load->req_freq;
 
-	qdf_mem_copy(&sme_rrm_ctx->chan_load_req_info.bw_ind,
-			&chan_load->bw_ind,
-			sizeof(sme_rrm_ctx->chan_load_req_info.bw_ind));
-	qdf_mem_copy(&sme_rrm_ctx->chan_load_req_info.wide_bw,
-			&chan_load->wide_bw,
-			sizeof(sme_rrm_ctx->chan_load_req_info.wide_bw));
+	qdf_mem_copy(&req_info->bw_ind, &chan_load->bw_ind,
+		     sizeof(req_info->bw_ind));
+	qdf_mem_copy(&req_info->wide_bw, &chan_load->wide_bw,
+		     sizeof(req_info->wide_bw));
 
-	sme_debug("idx:%d, token: %d randnIntvl: %d meas_duration %d, rrm_ctx dur %d reg_class: %d, type: %d, channel: %d, freq:%d, [bw_ind cw:%d, ccfs0:%d], [wide_bw cw:%d]",
+	sme_debug("idx:%d, token: %d randnIntvl: %d meas_duration %d, rrm_ctx dur %d reg_class: %d, type: %d, channel: %d, freq: %d, [bw_ind present: %d, cw: %d, ccfs0: %d], [wide_bw present: %d, cw: %d]",
 		  chan_load->measurement_idx, sme_rrm_ctx->token,
 		  sme_rrm_ctx->randnIntvl,
 		  chan_load->meas_duration,
 		  sme_rrm_ctx->duration[0], sme_rrm_ctx->regClass,
 		  sme_rrm_ctx->measurement_type,
-		  sme_rrm_ctx->chan_load_req_info.channel,
-		  sme_rrm_ctx->chan_load_req_info.req_freq,
-		  sme_rrm_ctx->chan_load_req_info.bw_ind.channel_width,
-		  sme_rrm_ctx->chan_load_req_info.bw_ind.center_freq,
-		  sme_rrm_ctx->chan_load_req_info.wide_bw.channel_width);
+		  req_info->channel, req_info->req_freq,
+		  req_info->bw_ind.is_bw_ind_element,
+		  req_info->bw_ind.channel_width,
+		  req_info->bw_ind.center_freq,
+		  req_info->wide_bw.is_wide_bw_chan_switch,
+		  req_info->wide_bw.channel_width);
 
 	return sme_rrm_issue_chan_load_measurement_scan(mac,
 						chan_load->measurement_idx);