Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a4677d5 authored by Utkarsh Bhatnagar's avatar Utkarsh Bhatnagar Committed by Madan Koyyalamudi
Browse files

qcacld-3.0: Update MLME Cfg num_ppe_th 

With Kernel 5.13.2 onwards, if
ppe_present is present in HE capabilities
then ppe_threshold fields are also required
to be sent such as length has to be non zero
and the data can be all zeros as part of
TDLS Discovery and Setup frame.

While sending setup frames, ies are packed using
dor11f apis such as dot11f_pack_ie_he_cap().
Even if ppet_present is set,
dot11f_pack_ie_he_cap() will only send
ppe_threshold if num_ppe_th is present.
The HE capabilties which are sent in these
are filled using MLME Cfg HE capabilities.
So, calculate and set num_ppe_th using cfg
ppe fields based on the operating band.
Also to cover a corner scenario where ppe_present
is set but calculated num_ppe_th is 0, set
num_ppe_th to 1 so that atleast 1 byte should be
sent to prevent framework from throwing
exception during add_sta.

Change-Id: Ibe4fd3fdacce24573c09b3609babf04ef4423fb1
CRs-Fixed: 3183531
parent 6e7c5953

core/mac/src/pe/lim/lim_process_tdls.c

+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -870,6 +871,38 @@ static void lim_tdls_set_he_chan_width(tDot11fIEhe_cap *heCap, 
	}

}



static void lim_tdls_populate_ppe_caps(struct mac_context *mac,

				       struct pe_session *session,

				       tDot11fIEhe_cap *he_cap)

{

	uint8_t *ppet;



	/*

	 * No Need to populate if ppet is not present

	 */

	if (!he_cap->ppet_present)

		return;



	if (!wlan_reg_is_24ghz_ch_freq(session->curr_op_freq))

		ppet = mac->mlme_cfg->he_caps.he_ppet_5g;

	else

		ppet = mac->mlme_cfg->he_caps.he_ppet_2g;



	he_cap->ppet.ppe_threshold.num_ppe_th = lim_truncate_ppet(ppet,

							      MLME_HE_PPET_LEN);



	/*

	 * If num_ppe_th calculated above is zero and ppet_present is set then

	 * atleast one byte should be sent with zero data otherwise framework

	 * will fail add_sta on the peer end.

	 */

	if (he_cap->ppet.ppe_threshold.num_ppe_th)

		qdf_mem_copy(he_cap->ppet.ppe_threshold.ppe_th, ppet,

			     MLME_HE_PPET_LEN);

	else

		he_cap->ppet.ppe_threshold.num_ppe_th = 1;

}



static void populate_dot11f_set_tdls_he_cap(struct mac_context *mac,

					    uint32_t selfDot11Mode,

					    tDot11fIEhe_cap *heCap,
@@ -879,6 +912,7 @@ static void populate_dot11f_set_tdls_he_cap(struct mac_context *mac, 
	if (IS_DOT11_MODE_HE(selfDot11Mode)) {

		populate_dot11f_he_caps(mac, NULL, heCap);

		lim_tdls_set_he_chan_width(heCap, session);

		lim_tdls_populate_ppe_caps(mac, session, heCap);

		lim_log_he_cap(mac, heCap);

		lim_populate_tdls_setup_6g_cap(mac, hecap_6g, session);

	} else {