qcacld-3.0: Add operating class triplet to country IE

The operating class triplet was removed from country IE. Add the logic
to populate it back in.

Change-Id: Ia9a1489e04d832b650dbe203534f38980e7e1506
CRs-fixed: 2913363

core/mac/src/include/parser_api.h

@@ -193,6 +193,7 @@ enum operating_class_num {
 
 enum operating_extension_identifier {
 	OP_CLASS_ID_200 = 200,
+	OP_CLASS_ID_201,
 };
 
 /* Structure common to Beacons & Probe Responses */

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -556,6 +556,7 @@ populate_dot11f_country(struct mac_context *mac,
 	uint8_t buffer_triplets[81][3];
 	uint8_t i, j, num_triplets = 0;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
+	bool six_gig_started = false;
 
 	cur_chan_list = qdf_mem_malloc(NUM_CHANNELS * sizeof(*cur_chan_list));
 	if (!cur_chan_list)
@@ -598,6 +599,14 @@ populate_dot11f_country(struct mac_context *mac,
 		if (cur_chan->chan_flags & REGULATORY_CHAN_DISABLED)
 			continue;
 
+		if (wlan_reg_is_6ghz_chan_freq(cur_chan->center_freq) &&
+		    !six_gig_started) {
+			buffer_triplets[num_triplets][0] = OP_CLASS_ID_201;
+			buffer_triplets[num_triplets][1] = OP_CLASS_131;
+			num_triplets++;
+			six_gig_started = true;
+		}
+
 		if (start && prev &&
 		    prev->chan_num + chan_spacing == cur_chan->chan_num &&
 		    start->tx_power == cur_chan->tx_power) {
@@ -624,6 +633,20 @@ populate_dot11f_country(struct mac_context *mac,
 			}
 		}
 
+		if ((chan_enum == NUM_CHANNELS - 1) && (six_gig_started)) {
+			buffer_triplets[num_triplets][0] = OP_CLASS_ID_201;
+			buffer_triplets[num_triplets][1] = OP_CLASS_132;
+			num_triplets++;
+
+			buffer_triplets[num_triplets][0] = OP_CLASS_ID_201;
+			buffer_triplets[num_triplets][1] = OP_CLASS_133;
+			num_triplets++;
+
+			buffer_triplets[num_triplets][0] = OP_CLASS_ID_201;
+			buffer_triplets[num_triplets][1] = OP_CLASS_134;
+			num_triplets++;
+		}
+
 		/* Start new group */
 		start = cur_chan;
 		prev = cur_chan;

core/sme/src/csr/csr_api_roam.c

@@ -12855,20 +12855,20 @@ static QDF_STATUS csr_iterate_triplets(tDot11fIECountry country_ie)
 {
 	u_int8_t i;
 
-	if (country_ie.first_triplet[0] >= OP_CLASS_ID_200) {
-		if (country_ie.more_triplets[0][0] < OP_CLASS_ID_200)
+	if (country_ie.first_triplet[0] > OP_CLASS_ID_200) {
+		if (country_ie.more_triplets[0][0] <= OP_CLASS_ID_200)
 			return QDF_STATUS_SUCCESS;
 	}
 
 	for (i = 0; i < country_ie.num_more_triplets; i++) {
-		if ((country_ie.more_triplets[i][0] >= OP_CLASS_ID_200) &&
+		if ((country_ie.more_triplets[i][0] > OP_CLASS_ID_200) &&
 		    (i < country_ie.num_more_triplets - 1)) {
-			if (country_ie.more_triplets[i + 1][0] <
+			if (country_ie.more_triplets[i + 1][0] <=
 			    OP_CLASS_ID_200)
 				return QDF_STATUS_SUCCESS;
 		}
 	}
-	sme_debug("No operating class triplet followed by channel range triplet");
+	sme_debug("No operating class triplet followed by sub-band triplet");
 	return QDF_STATUS_SUCCESS;
 }