Ver Fonte

qcacld-3.0: Replace chan with chan_freq

Replace chan with chan_freq in hdd_chan_change_params.

Change-Id: I6e3b4de0e1322cb35500aa86fa4119c60faee36e
CRs-Fixed: 2496790
Paul Zhang há 5 anos atrás
pai
commit
427962da57

+ 2 - 2
core/hdd/inc/wlan_hdd_main.h

@@ -1093,11 +1093,11 @@ struct hdd_netif_queue_history {
 
 /**
  * struct hdd_chan_change_params - channel related information
- * @chan: operating channel
+ * @chan_freq: operating channel frequency
  * @chan_params: channel parameters
  */
 struct hdd_chan_change_params {
-	uint8_t chan;
+	uint32_t chan_freq;
 	struct ch_params chan_params;
 };
 

+ 3 - 1
core/hdd/src/wlan_hdd_assoc.c

@@ -4682,7 +4682,9 @@ static void hdd_roam_channel_switch_handler(struct hdd_adapter *adapter,
 		sme_start_roaming(mac_handle, adapter->vdev_id,
 				  REASON_DRIVER_ENABLED);
 
-	chan_change.chan = roam_info->chan_info.chan_id;
+	chan_change.chan_freq =
+		wlan_reg_chan_to_freq(hdd_ctx->pdev,
+				      roam_info->chan_info.chan_id);
 	chan_change.chan_params.ch_width =
 		roam_info->chan_info.ch_width;
 	chan_change.chan_params.sec_ch_offset =

+ 6 - 5
core/hdd/src/wlan_hdd_hostapd.c

@@ -831,13 +831,13 @@ QDF_STATUS hdd_chan_change_notify(struct hdd_adapter *adapter,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	hdd_debug("chan:%d width:%d sec_ch_offset:%d seg0:%d seg1:%d",
-		chan_change.chan, chan_change.chan_params.ch_width,
+	hdd_debug("chan_freq:%d width:%d sec_ch_offset:%d seg0:%d seg1:%d",
+		chan_change.chan_freq, chan_change.chan_params.ch_width,
 		chan_change.chan_params.sec_ch_offset,
 		chan_change.chan_params.center_freq_seg0,
 		chan_change.chan_params.center_freq_seg1);
 
-	freq = cds_chan_to_freq(chan_change.chan);
+	freq = chan_change.chan_freq;
 
 	chan = ieee80211_get_channel(adapter->wdev.wiphy, freq);
 
@@ -2557,8 +2557,9 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 			break;
 		}
 
-		chan_change.chan =
-			sap_event->sapevt.sap_ch_selected.pri_ch;
+		chan_change.chan_freq =
+			wlan_reg_chan_to_freq(hdd_ctx->pdev,
+				sap_event->sapevt.sap_ch_selected.pri_ch);
 		chan_change.chan_params.ch_width =
 			sap_event->sapevt.sap_ch_selected.ch_width;
 		chan_change.chan_params.sec_ch_offset =