qcacld-3.0: Replace channel with frequency in channel_info

Replace channel ID with frequency in struct hdd_channel_info
& oem_channel_info.

Change-Id: I1a14ab40da4824d2861a7ec862cc322a158f0cd1
CRs-Fixed: 2532299

core/hdd/inc/wlan_hdd_main.h

@@ -3275,7 +3275,6 @@ static inline void hdd_send_peer_status_ind_to_app(
 		return;
 	}
 
-	ch_info.chan_id = chan_info->chan_id;
 	ch_info.mhz = chan_info->mhz;
 	ch_info.band_center_freq1 = chan_info->band_center_freq1;
 	ch_info.band_center_freq2 = chan_info->band_center_freq2;

core/hdd/inc/wlan_hdd_oemdata.h

@@ -107,7 +107,6 @@ struct oem_data_cap {
 
 /**
  * struct hdd_channel_info - Channel information
- * @chan_id: channel id
  * @reserved0: reserved for padding and future use
  * @mhz: primary 20 MHz channel frequency in mhz
  * @band_center_freq1: Center frequency 1 in MHz
@@ -119,7 +118,6 @@ struct oem_data_cap {
  * @reg_info_2: regulatory information field 2 which contains antennamax
  */
 struct hdd_channel_info {
-	uint32_t chan_id;
 	uint32_t reserved0;
 	uint32_t mhz;
 	uint32_t band_center_freq1;

core/hdd/src/wlan_hdd_assoc.c

@@ -1410,7 +1410,6 @@ static void hdd_send_association_event(struct net_device *dev,
 		}
 		qdf_copy_macaddr(&peer_macaddr,
 				 &sta_ctx->conn_info.bssid);
-		chan_info.chan_id = roam_info->chan_info.chan_id;
 		chan_info.mhz = roam_info->chan_info.mhz;
 		chan_info.info = roam_info->chan_info.info;
 		chan_info.band_center_freq1 =
@@ -4653,17 +4652,15 @@ static void hdd_roam_channel_switch_handler(struct hdd_adapter *adapter,
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	mac_handle_t mac_handle = hdd_adapter_get_mac_handle(adapter);
 
-	hdd_debug("channel switch for session:%d to channel:%d",
-		adapter->vdev_id, roam_info->chan_info.chan_id);
+	hdd_debug("channel switch for session:%d to channel freq:%d",
+		adapter->vdev_id, roam_info->chan_info.mhz);
 
 	/* Enable Roaming on STA interface which was disabled before CSA */
 	if (adapter->device_mode == QDF_STA_MODE)
 		sme_start_roaming(mac_handle, adapter->vdev_id,
 				  REASON_DRIVER_ENABLED);
 
-	chan_change.chan_freq =
-		wlan_reg_chan_to_freq(hdd_ctx->pdev,
-				      roam_info->chan_info.chan_id);
+	chan_change.chan_freq = roam_info->chan_info.mhz;
 	chan_change.chan_params.ch_width =
 		roam_info->chan_info.ch_width;
 	chan_change.chan_params.sec_ch_offset =

core/hdd/src/wlan_hdd_hostapd.c

@@ -1461,7 +1461,7 @@ static void hdd_fill_station_info(struct hdd_adapter *adapter,
 
 	qdf_mem_copy(&stainfo->capability, &event->capability_info,
 		     sizeof(uint16_t));
-	stainfo->freq = cds_chan_to_freq(event->chan_info.chan_id);
+	stainfo->freq = event->chan_info.mhz;
 	stainfo->sta_type = event->staType;
 	stainfo->dot11_mode =
 		hdd_convert_dot11mode_from_phymode(event->chan_info.info);
@@ -1635,7 +1635,7 @@ hdd_hostapd_apply_action_oui(struct hdd_context *hdd_ctx,
 	if (ch_width != eHT_CHANNEL_WIDTH_20MHZ)
 		return;
 
-	freq = cds_chan_to_freq(event->chan_info.chan_id);
+	freq = event->chan_info.mhz;
 	if (WLAN_REG_IS_24GHZ_CH_FREQ(freq))
 		attr.enable_2g = true;
 	else if (WLAN_REG_IS_5GHZ_CH_FREQ(freq))

core/hdd/src/wlan_hdd_oemdata.c

@@ -500,9 +500,8 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList)
 					  &reg_info_1, &reg_info_2);
 		if (QDF_STATUS_SUCCESS == status) {
 			/* copy into hdd chan info struct */
-			hddChanInfo.chan_id = chanId;
 			hddChanInfo.reserved0 = 0;
-			hddChanInfo.mhz = cds_chan_to_freq(chanId);
+			hddChanInfo.mhz = wlan_reg_chan_to_freq(p_hdd_ctx->pdev, chanId);
 			hddChanInfo.band_center_freq1 = hddChanInfo.mhz;
 			hddChanInfo.band_center_freq2 = 0;
 
@@ -522,9 +521,8 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList)
 			 */
 			hdd_debug("sme_get_reg_info failed for chan: %d, fill 0s",
 				   chanId);
-			hddChanInfo.chan_id = chanId;
 			hddChanInfo.reserved0 = 0;
-			hddChanInfo.mhz = 0;
+			hddChanInfo.mhz = wlan_reg_chan_to_freq(p_hdd_ctx->pdev, chanId);
 			hddChanInfo.band_center_freq1 = 0;
 			hddChanInfo.band_center_freq2 = 0;
 			hddChanInfo.info = 0;
@@ -721,7 +719,6 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peer_mac,
 		peer_info->reserved0 |= 0x01;
 
 	if (chan_info) {
-		peer_info->peer_chan_info.chan_id = chan_info->chan_id;
 		peer_info->peer_chan_info.reserved0 = 0;
 		peer_info->peer_chan_info.mhz = chan_info->mhz;
 		peer_info->peer_chan_info.band_center_freq1 =
@@ -735,14 +732,13 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peer_mac,
 	skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + ani_hdr->length)));
 
 	hdd_info("sending peer " QDF_MAC_ADDR_STR
-		  " status(%d), peer_capability(%d), vdev_id(%d), chanId(%d)"
+		  " status(%d), peer_capability(%d), vdev_id(%d),"
 		  " to oem app pid(%d), center freq 1 (%d), center freq 2 (%d),"
 		  " info (0x%x), frequency (%d),reg info 1 (0x%x),"
 		  " reg info 2 (0x%x)",
 		  QDF_MAC_ADDR_ARRAY(peer_mac->bytes),
 		  peer_status, peer_capability,
-		  vdev_id, peer_info->peer_chan_info.chan_id,
-		  p_hdd_ctx->oem_pid,
+		  vdev_id, p_hdd_ctx->oem_pid,
 		  peer_info->peer_chan_info.band_center_freq1,
 		  peer_info->peer_chan_info.band_center_freq2,
 		  peer_info->peer_chan_info.info,

core/mac/inc/sir_api.h

@@ -1030,7 +1030,6 @@ struct join_rsp {
 };
 
 struct oem_channel_info {
-	uint8_t chan_id;
 	uint32_t mhz;
 	uint32_t band_center_freq1;
 	uint32_t band_center_freq2;

core/mac/src/pe/lim/lim_process_assoc_req_frame.c

@@ -2757,8 +2757,6 @@ void lim_send_mlm_assoc_ind(struct mac_context *mac_ctx,
 		assoc_ind->beaconPtr = session_entry->beacon;
 		assoc_ind->beaconLength = session_entry->bcnLen;
 
-		assoc_ind->chan_info.chan_id = wlan_reg_freq_to_chan(
-			mac_ctx->pdev, session_entry->curr_op_freq);
 		assoc_ind->chan_info.mhz = session_entry->curr_op_freq;
 		assoc_ind->chan_info.band_center_freq1 =
 			session_entry->curr_op_freq;

core/sap/src/sap_fsm.c

@@ -1606,7 +1606,6 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 		/* also fill up the channel info from the csr_roamInfo */
 		chaninfo = &reassoc_complete->chan_info;
 
-		chaninfo->chan_id = csr_roaminfo->chan_info.chan_id;
 		chaninfo->mhz = csr_roaminfo->chan_info.mhz;
 		chaninfo->info = csr_roaminfo->chan_info.info;
 		chaninfo->band_center_freq1 =

core/sme/src/csr/csr_api_roam.c

@@ -3325,6 +3325,7 @@ QDF_STATUS csr_roam_call_callback(struct mac_context *mac, uint32_t sessionId,
 	struct csr_roam_session *pSession;
 	tDot11fBeaconIEs *beacon_ies = NULL;
 	uint8_t chan1, chan2;
+	uint8_t chan_id;
 
 	if (!CSR_IS_SESSION_VALID(mac, sessionId)) {
 		sme_err("Session ID: %d is not valid", sessionId);
@@ -3364,18 +3365,12 @@ QDF_STATUS csr_roam_call_callback(struct mac_context *mac, uint32_t sessionId,
 			roam_info->chan_info.band_center_freq2 = 0;
 			roam_info->chan_info.info = 0;
 		}
-		roam_info->chan_info.chan_id =
-			wlan_reg_freq_to_chan(
-				mac->pdev,
-				roam_info->u.pConnectedProfile->op_freq);
-		roam_info->chan_info.mhz =
-			cds_chan_to_freq(roam_info->chan_info.chan_id);
+		roam_info->chan_info.mhz = roam_info->u.pConnectedProfile->op_freq;
+		chan_id = wlan_reg_freq_to_chan(mac->pdev, roam_info->chan_info.mhz);
 		roam_info->chan_info.reg_info_1 =
-			(csr_get_cfg_max_tx_power(mac,
-				roam_info->chan_info.chan_id) << 16);
+			(csr_get_cfg_max_tx_power(mac, chan_id) << 16);
 		roam_info->chan_info.reg_info_2 =
-			(csr_get_cfg_max_tx_power(mac,
-				roam_info->chan_info.chan_id) << 8);
+			(csr_get_cfg_max_tx_power(mac, chan_id) << 8);
 		qdf_mem_free(beacon_ies);
 	} else if ((u1 == eCSR_ROAM_FT_REASSOC_FAILED)
 			&& (pSession->bRefAssocStartCnt)) {
@@ -11656,8 +11651,7 @@ csr_roam_chk_lnk_swt_ch_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 	roam_info = qdf_mem_malloc(sizeof(*roam_info));
 	if (!roam_info)
 		return;
-	roam_info->chan_info.chan_id =
-		wlan_reg_freq_to_chan(mac_ctx->pdev, pSwitchChnInd->freq);
+	roam_info->chan_info.mhz = pSwitchChnInd->freq;
 	roam_info->chan_info.ch_width = pSwitchChnInd->chan_params.ch_width;
 	roam_info->chan_info.sec_ch_offset =
 				pSwitchChnInd->chan_params.sec_ch_offset;