A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: modify populate_dot11f_country for 6 ghz

Browse source 
For SAP, country IE takes different input for 6ghz channels.
for 6 ghz, we need to add operating class triplet also. So, before
the sub-band triplet, operating class triplet needs to be added.

Change-Id: I43d37d0f23276dbe7fed35d8c2251d9e15b16fa9
CRs-fixed: 2862999
This commit is contained in:
Amar Singhal 2020-12-09 14:59:14 -08:00 • committed by snandini
commit 46b1af6a2e
2 changed files with 49 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/mac/src/include/parser_api.h
View file

@ -193,6 +193,19 @@ struct sir_fils_indication {
};
#endif
enum operating_class_num {
OP_CLASS_131 = 131,
OP_CLASS_132,
OP_CLASS_133,
OP_CLASS_134,
OP_CLASS_135,
OP_CLASS_136,
};
enum operating_extension_identifier {
OP_CLASS_ID_200 = 200,
};
/* Structure common to Beacons & Probe Responses */
typedef struct sSirProbeRespBeacon {
tSirMacTimeStamp timeStamp;

59
core/mac/src/sys/legacy/src/utils/src/parser_api.c
View file

@ -402,6 +402,7 @@ populate_dot11f_country(struct mac_context *mac,
uint8_t buffer_triplets[81][3];
uint8_t i, j, num_triplets = 0;
QDF_STATUS status;
bool six_gig_started = false;
cur_chan_list = qdf_mem_malloc(NUM_CHANNELS * sizeof(*cur_chan_list));
if (!cur_chan_list)
@ -422,24 +423,10 @@ populate_dot11f_country(struct mac_context *mac,
cur_triplet_valid = false;
for (chan_enum = 0; chan_enum < NUM_CHANNELS; chan_enum++) {
if (wlan_reg_is_6ghz_chan_freq(
cur_chan_list[chan_enum].center_freq)) {
if (cur_triplet_valid) {
buffer_triplets[num_triplets][0] =
wlan_reg_freq_to_chan(mac->pdev,
cur_triplet_freq);
buffer_triplets[num_triplets][1] =
cur_triplet_num_chans;
buffer_triplets[num_triplets][2] =
cur_triplet_tx_power;
num_triplets++;
cur_triplet_valid = false;
}
break;
}
if (cur_chan_list[chan_enum].chan_flags &
REGULATORY_CHAN_DISABLED) {
REGULATORY_CHAN_DISABLED ||
(chan_enum == NUM_CHANNELS - 1)) {
if (cur_triplet_valid) {
buffer_triplets[num_triplets][0] =
wlan_reg_freq_to_chan(mac->pdev,
@ -455,12 +442,13 @@ populate_dot11f_country(struct mac_context *mac,
}
if (cur_triplet_valid) {
if ((cur_chan_list[chan_enum].tx_power ==
cur_triplet_tx_power) &&
(cur_triplet_band ==
wlan_reg_freq_to_band(cur_chan_list[chan_enum].center_freq)))
if (((cur_chan_list[chan_enum].tx_power ==
cur_triplet_tx_power) &&
(cur_triplet_band ==
wlan_reg_freq_to_band(cur_chan_list[chan_enum].center_freq))) ||
wlan_reg_freq_to_band(cur_chan_list[chan_enum].center_freq == REG_BAND_6G)) {
cur_triplet_num_chans++;
else {
} else {
buffer_triplets[num_triplets][0] =
wlan_reg_freq_to_chan(mac->pdev,
cur_triplet_freq);
@ -475,16 +463,41 @@ populate_dot11f_country(struct mac_context *mac,
cur_triplet_num_chans = 1;
cur_triplet_tx_power =
cur_chan_list[chan_enum].tx_power;
cur_triplet_band = wlan_reg_freq_to_band(cur_triplet_freq);
cur_triplet_band =
wlan_reg_freq_to_band(cur_triplet_freq);
}
} else {
if (wlan_reg_is_6ghz_chan_freq(cur_chan_list[chan_enum].
center_freq) &&
(six_gig_started == false)) {
buffer_triplets[num_triplets][0] =
OP_CLASS_ID_200;
buffer_triplets[num_triplets][1] = OP_CLASS_131;
num_triplets++;
six_gig_started = true;
}
cur_triplet_freq = cur_chan_list[chan_enum].center_freq;
cur_triplet_num_chans = 1;
cur_triplet_tx_power =
cur_chan_list[chan_enum].tx_power;
cur_triplet_band = wlan_reg_freq_to_band(cur_triplet_freq);
cur_triplet_band =
wlan_reg_freq_to_band(cur_triplet_freq);
cur_triplet_valid = true;
}
if ((chan_enum == NUM_CHANNELS - 1) && (six_gig_started)) {
buffer_triplets[num_triplets][0] = OP_CLASS_ID_200;
buffer_triplets[num_triplets][1] = OP_CLASS_132;
num_triplets++;
buffer_triplets[num_triplets][0] = OP_CLASS_ID_200;
buffer_triplets[num_triplets][1] = OP_CLASS_133;
num_triplets++;
buffer_triplets[num_triplets][0] = OP_CLASS_ID_200;
buffer_triplets[num_triplets][1] = OP_CLASS_134;
num_triplets++;
}
}
if (num_triplets == 0) {