Răsfoiți Sursa

qcacmn: Change reg_punc_pattern to reg_punc_bitmap

Puncture bitmap is different from Puncture pattern.
A bit in the puncture bitmap is set to 1 to indicate the corresponding
20 MHz subchannel is punctured and set to 0 to indicate the
corresponding 20 MHz subchannel is not punctured. Puncture pattern
is the reverse of puncture bitmap.

From the use of reg_punc_pattern, it should be puncture bitmap.
Rename reg_punc_pattern to reg_punc_bitmap.

Change-Id: I1c7fc1b689ba724862761dc10f72a543679bb85e
CRs-Fixed: 3108165
Bing Sun 3 ani în urmă
părinte
comite
96599ce00e

+ 9 - 9
umac/regulatory/core/src/reg_services_common.c

@@ -3718,7 +3718,7 @@ reg_get_320_bonded_chan_array(struct wlan_objmgr_pdev *pdev,
  * @freq: Frequency in MHZ.
  * @bonded_chan_ptr: Pointer to const struct bonded_channel_freq.
  * @bw: channel bandwidth
- * @out_punc_pat: Output puncturing pattern
+ * @out_punc_bitmap: Output puncturing bitmap
  *
  * Return - The channel state of the bonded pair.
  */
@@ -3735,14 +3735,14 @@ reg_get_320_bonded_channel_state(struct wlan_objmgr_pdev *pdev,
 				 const struct bonded_channel_freq
 				 *bonded_chan_ptr,
 				 enum phy_ch_width bw,
-				 uint16_t *out_punc_pat)
+				 uint16_t *out_punc_bitmap)
 {
 	enum channel_state chan_state = CHANNEL_STATE_INVALID;
 	enum channel_state temp_chan_state;
 	uint16_t chan_cfreq;
 	uint16_t max_cont_bw, i;
 
-	*out_punc_pat = ALL_SCHANS_PUNC;
+	*out_punc_bitmap = ALL_SCHANS_PUNC;
 
 	if (!bonded_chan_ptr)
 		return chan_state;
@@ -3757,7 +3757,7 @@ reg_get_320_bonded_channel_state(struct wlan_objmgr_pdev *pdev,
 								 chan_cfreq);
 		if (reg_is_state_allowed(temp_chan_state)) {
 			max_cont_bw += SUB_CHAN_BW;
-			*out_punc_pat &= ~BIT(i);
+			*out_punc_bitmap &= ~BIT(i);
 		}
 
 		if (temp_chan_state < chan_state)
@@ -3847,7 +3847,7 @@ reg_fill_channel_list_for_320(struct wlan_objmgr_pdev *pdev,
 	uint8_t num_bonded_pairs, i, num_ch_params;
 	enum channel_state chan_state;
 	uint16_t array_size = QDF_ARRAY_SIZE(bonded_chan_320mhz_list_freq);
-	uint16_t out_punc_pat;
+	uint16_t out_punc_bitmap;
 	uint16_t max_reg_bw;
 	enum channel_enum chan_enum;
 	const struct bonded_channel_freq *bonded_ch_ptr[2] = {NULL, NULL};
@@ -3909,7 +3909,7 @@ reg_fill_channel_list_for_320(struct wlan_objmgr_pdev *pdev,
 		    reg_get_320_bonded_channel_state(pdev, freq,
 						     bonded_ch_ptr[i],
 						     *in_ch_width,
-						     &out_punc_pat);
+						     &out_punc_bitmap);
 		if (chan_state == CHANNEL_STATE_ENABLE) {
 			struct ch_params *t_chan_param =
 			    &chan_list->chan_param[num_ch_params];
@@ -3921,7 +3921,7 @@ reg_fill_channel_list_for_320(struct wlan_objmgr_pdev *pdev,
 				reg_freq_to_chan(pdev,
 						 t_chan_param->mhz_freq_seg1);
 			t_chan_param->ch_width = *in_ch_width;
-			t_chan_param->reg_punc_pattern = out_punc_pat;
+			t_chan_param->reg_punc_bitmap = out_punc_bitmap;
 
 			reg_fill_primary_160mhz_centers(pdev,
 							t_chan_param,
@@ -3998,7 +3998,7 @@ reg_fill_pre320mhz_channel(struct wlan_objmgr_pdev *pdev,
 {
 	chan_list->num_ch_params = 1;
 	chan_list->chan_param[0].ch_width = ch_width;
-	chan_list->chan_param[0].reg_punc_pattern = NO_SCHANS_PUNC;
+	chan_list->chan_param[0].reg_punc_bitmap = NO_SCHANS_PUNC;
 	reg_set_chan_params_for_freq(pdev, freq, sec_ch_2g_freq, chan_list);
 }
 
@@ -4400,7 +4400,7 @@ static void reg_copy_ch_params(struct ch_params *ch_params,
 	ch_params->mhz_freq_seg1 = chan_list.chan_param[0].mhz_freq_seg1;
 	ch_params->ch_width = chan_list.chan_param[0].ch_width;
 	ch_params->sec_ch_offset = chan_list.chan_param[0].sec_ch_offset;
-	ch_params->reg_punc_pattern = chan_list.chan_param[0].reg_punc_pattern;
+	ch_params->reg_punc_bitmap = chan_list.chan_param[0].reg_punc_bitmap;
 }
 
 void reg_set_channel_params_for_freq(struct wlan_objmgr_pdev *pdev,

+ 2 - 2
umac/regulatory/dispatcher/inc/reg_services_public_struct.h

@@ -636,7 +636,7 @@ struct freq_range {
  * @center_freq_seg1: channel number segment 1
  * @mhz_freq_seg0: Center frequency for segment 0
  * @mhz_freq_seg1: Center frequency for segment 1
- * @reg_punc_pattern: Output puncturing pattern
+ * @reg_punc_bitmap: Output puncturing bitmap
  */
 struct ch_params {
 	enum phy_ch_width ch_width;
@@ -646,7 +646,7 @@ struct ch_params {
 	qdf_freq_t mhz_freq_seg0;
 	qdf_freq_t mhz_freq_seg1;
 #ifdef WLAN_FEATURE_11BE
-	uint16_t reg_punc_pattern;
+	uint16_t reg_punc_bitmap;
 #endif
 };