samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Forka 0
Codice Problemi Pull Requests Actions Pacchetti Progetti Rilasci Wiki Attività

qcacld-3.0: Fix TIM ie size error issue

Sfoglia il codice sorgente 
TIM ie size previous fixed value is wrong, the size shall
be calculated according to the maximum number of STA.

Change-Id: I80700fd101fcfb6bb3e2e915f1188a3190e369f8
CRs-Fixed: 3347274
This commit is contained in:
Zhiwei Yang
2022-11-29 10:25:39 +08:00
committato da Madan Koyyalamudi
parent ed69fea017
commit f3da1c5736
2 ha cambiato i file con 42 aggiunte e 7 eliminazioni
Scarica il file Patch Scarica il file Diff Expand all files Collapse all files

2
core/mac/src/pe/include/sch_global.h
Vedi File

@@ -36,8 +36,6 @@
#include "parser_api.h"
#define TIM_IE_SIZE 0xB
/* ----------------------- Beacon processing ------------------------ */
/* / Beacon structure */

47
core/mac/src/pe/sch/sch_beacon_gen.c
Vedi File

@@ -487,6 +487,40 @@ populate_channel_switch_ann(struct mac_context *mac_ctx,
bcn->ChannelSwitchWrapper.WiderBWChanSwitchAnn.newCenterChanFreq1);
}
/**
* sch_get_tim_size() - Get TIM ie size
* @max_aid: Max AID value
*
* Return: TIM ie size
*/
static uint16_t sch_get_tim_size(uint32_t max_aid)
{
uint16_t tim_size;
uint8_t N2;
/**
* The TIM ie format:
* +----------+------+----------+-------------------------------------------------+
* |Element ID|Length|DTIM Count|DTIM Period|Bitmap Control|Partial Virtual Bitmap|
* +----------+------+----------+-----------+--------------+----------------------+
* 1 Byte 1 Byte 1Byte 1 Byte 1 Byte 0~255 Byte
*
* According to 80211 Spec, The Partial Virtual Bitmap field consists of octets
* numbered N1 to N2 of the traffic indication virtual bitmap, where N1 is the
* largest even number such that bits numbered 1 to (N1 * 8) – 1 in the traffic
* indication virtual bitmap are all 0, and N2 is the smallest number such that
* bits numbered (N2 + 1) * 8 to 2007 in the traffic indication virtual bitmap
* are all 0. In this case, the Bitmap Offset subfield value contains the number
* N1/2, and the Length field is set to (N2 – N1) + 4. Always start with AID 1 as
* minimum, N1 = (1 / 8) = 0. TIM size = length + 1Byte Element ID + 1Byte Length.
* The expression is reduced to (N2 - 0) + 4 + 2 = N2 + 6;
*/
N2 = max_aid / 8;
tim_size = N2 + 6;
return tim_size;
}
/**
* sch_set_fixed_beacon_fields() - sets the fixed params in beacon frame
* @mac_ctx: mac global context
@@ -528,6 +562,9 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess
bool is_band_2g;
uint16_t ie_buf_size;
uint16_t mlo_ie_len = 0;
uint16_t tim_size;
tim_size = sch_get_tim_size(HAL_NUM_STA);
bcn_1 = qdf_mem_malloc(sizeof(tDot11fBeacon1));
if (!bcn_1)
@@ -968,18 +1005,18 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess
if (csa_count_offset)
mac_ctx->sch.csa_count_offset =
session->schBeaconOffsetBegin + TIM_IE_SIZE +
session->schBeaconOffsetBegin + tim_size +
csa_count_offset;
if (ecsa_count_offset)
mac_ctx->sch.ecsa_count_offset =
session->schBeaconOffsetBegin + TIM_IE_SIZE +
session->schBeaconOffsetBegin + tim_size +
ecsa_count_offset;
if (wlan_vdev_mlme_is_mlo_ap(session->vdev))
lim_upt_mlo_partner_info(mac_ctx, session,
session->pSchBeaconFrameEnd, n_bytes,
session->schBeaconOffsetBegin +
TIM_IE_SIZE);
tim_size);
extra_ie = session->pSchBeaconFrameEnd + n_bytes;
extra_ie_offset = n_bytes;
@@ -988,7 +1025,7 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess
* Max size left to append additional IE.= (MAX beacon size - TIM IE -
* beacon fix size (bcn_1 + header) - beacon variable size (bcn_1).
*/
bcn_size_left = SIR_MAX_BEACON_SIZE - TIM_IE_SIZE -
bcn_size_left = SIR_MAX_BEACON_SIZE - tim_size -
session->schBeaconOffsetBegin -
(uint16_t)n_bytes;
@@ -1006,7 +1043,7 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess
if (QDF_STATUS_SUCCESS == status)
/* Update the P2P Ie Offset */
mac_ctx->sch.p2p_ie_offset =
session->schBeaconOffsetBegin + TIM_IE_SIZE +
session->schBeaconOffsetBegin + tim_size +
extra_ie_offset + p2p_ie_offset;
else
mac_ctx->sch.p2p_ie_offset = 0;