Selaa lähdekoodia

qca-wifi: Add 6GHz support for chan/freq/band usage in mesh mode

Currently mesh mode uses channel numbering scheme which is derived
from APIs which don't support 6GHz channel numbering. This is
important because the channel numbers for 6GHz are overloaded with
those in the 2.4GHz and 5GHz band.

Add support to obtain the correct channel number (and auxiliary
information like band and frequency) through the new APIs that
support 6GHz.

Change-Id: I60afa5294af5e5681974f1bbc45c9e008eda1232
CRs-Fixed: 2605229
Aditya Sathish 5 vuotta sitten
vanhempi
sitoutus
190c110b59
1 muutettua tiedostoa jossa 4 lisäystä ja 5 poistoa
  1. 4 5
      dp/wifi3.0/dp_tx_capture.c

+ 4 - 5
dp/wifi3.0/dp_tx_capture.c

@@ -1445,7 +1445,8 @@ QDF_STATUS dp_send_dummy_mpdu_info_to_stack(struct dp_pdev *pdev,
 	tx_capture_info.ppdu_desc = ppdu_desc;
 
 	mpdu_info->ppdu_id = ppdu_desc->ppdu_id;
-	mpdu_info->channel_num = pdev->operating_channel;
+
+	mpdu_info->channel_num = pdev->operating_channel.num;
 	mpdu_info->channel = ppdu_desc->channel;
 	mpdu_info->frame_type = ppdu_desc->frame_type;
 	mpdu_info->ppdu_start_timestamp = ppdu_desc->ppdu_start_timestamp;
@@ -1694,9 +1695,7 @@ void dp_send_data_to_stack(struct dp_pdev *pdev,
 				    &tx_capture_info.mpdu_info,
 				    &ppdu_desc->user[0]);
 	tx_capture_info.ppdu_desc = ppdu_desc;
-
-	tx_capture_info.mpdu_info.channel_num =
-		pdev->operating_channel;
+	tx_capture_info.mpdu_info.channel_num = pdev->operating_channel.num;
 
 	if (ppdu_desc->mprot_type)
 		dp_send_dummy_rts_cts_frame(pdev, ppdu_desc);
@@ -2145,8 +2144,8 @@ dp_update_tx_cap_info(struct dp_pdev *pdev,
 				    &tx_capture_info->mpdu_info,
 				    &ppdu_desc->user[0]);
 	tx_capture_info->ppdu_desc = ppdu_desc;
+	tx_capture_info->mpdu_info.channel_num = pdev->operating_channel.num;
 
-	tx_capture_info->mpdu_info.channel_num = pdev->operating_channel;
 	tx_capture_info->mpdu_info.ppdu_id = ppdu_desc->ppdu_id;
 	if (is_payload)
 		tx_capture_info->mpdu_nbuf = qdf_nbuf_alloc(pdev->soc->osdev,