qcacld-3.0: Add EID=195 for probe response

CERT test case VHT-4.2.16h will check VHT Transmit Power Envelope IE
in both beacon and probe response frames, we only have it in beacon
frame.

Change-Id: Ie2447fa7affdf8211a46877e0d8b0e41796f0cc3 removed TPE IE
from add IEs and add TPE IE to beacon template, so need add EID=195
to probe response template for target and lim sending probe response
frame for host.

Change-Id: I649f722db552223d2daf912980db0652b9120f63
CRs-Fixed: 2661422
This commit is contained in:
Will Huang 2020-04-14 17:07:30 +08:00 • committed by nshrivas
commit 4a2a2e6fda
5 changed files with 25 additions and 7 deletions

View file

@ -3939,6 +3939,8 @@ FRAME ProbeResponse // 7.2.3.9
OPTIE VHTCaps;
OPTIE VHTOperation;
OPTIE vht_transmit_power_env;
OPTIE ChannelSwitchWrapper;
OPTIE VHTExtBssLoad;
OPTIE ExtCap;
OPTIE OBSSScanParameters;
@ -3947,7 +3949,6 @@ FRAME ProbeResponse // 7.2.3.9
OPTIE vendor_vht_ie;
OPTIE Vendor3IE;
OPTIE hs20vendor_ie;
OPTIE ChannelSwitchWrapper;
OPTIE QComVendorIE;
OPTIE ESEVersion;
OPTIE MBO_IE;

View file

@ -26,7 +26,7 @@
*
*
* This file was automatically generated by 'framesc'
* Mon Mar 16 12:19:32 2020 from the following file(s):
* Wed Apr 15 11:04:38 2020 from the following file(s):
*
* dot11f.frms
*
@ -10474,6 +10474,8 @@ typedef struct sDot11fProbeResponse{
tDot11fIEP2PProbeRes P2PProbeRes;
tDot11fIEVHTCaps VHTCaps;
tDot11fIEVHTOperation VHTOperation;
tDot11fIEvht_transmit_power_env vht_transmit_power_env;
tDot11fIEChannelSwitchWrapper ChannelSwitchWrapper;
tDot11fIEVHTExtBssLoad VHTExtBssLoad;
tDot11fIEExtCap ExtCap;
tDot11fIEOBSSScanParameters OBSSScanParameters;
@ -10482,7 +10484,6 @@ typedef struct sDot11fProbeResponse{
tDot11fIEvendor_vht_ie vendor_vht_ie;
tDot11fIEVendor3IE Vendor3IE;
tDot11fIEhs20vendor_ie hs20vendor_ie;
tDot11fIEChannelSwitchWrapper ChannelSwitchWrapper;
tDot11fIEQComVendorIE QComVendorIE;
tDot11fIEESEVersion ESEVersion;
tDot11fIEMBO_IE MBO_IE;

View file

@ -692,6 +692,11 @@ lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx,
populate_dot11f_vht_caps(mac_ctx, pe_session, &frm->VHTCaps);
populate_dot11f_vht_operation(mac_ctx, pe_session,
&frm->VHTOperation);
populate_dot11f_vht_tx_power_env(
mac_ctx,
&frm->vht_transmit_power_env,
pe_session->ch_width,
pe_session->curr_op_freq);
/*
* we do not support multi users yet.
* populate_dot11f_vht_ext_bss_load( mac_ctx,

View file

@ -856,6 +856,13 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(struct mac_context *mac,
(void *)&beacon2->VHTOperation,
sizeof(beacon2->VHTOperation));
}
if (beacon2->vht_transmit_power_env.present) {
set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap,
WLAN_ELEMID_VHT_TX_PWR_ENVLP);
qdf_mem_copy((void *)&prb_rsp->vht_transmit_power_env,
(void *)&beacon2->vht_transmit_power_env,
sizeof(beacon2->vht_transmit_power_env));
}
if (beacon2->VHTExtBssLoad.present) {
set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap,
WLAN_ELEMID_EXT_BSS_LOAD);

View file

@ -11392,6 +11392,14 @@ static const tIEDefn IES_ProbeResponse[] = {
offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation",
0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0},
0, DOT11F_EID_VHTOPERATION, 0, 0, },
{ offsetof(tDot11fProbeResponse, vht_transmit_power_env),
offsetof(tDot11fIEvht_transmit_power_env, present), 0,
"vht_transmit_power_env", 0, 4, 7, SigIevht_transmit_power_env,
{0, 0, 0, 0, 0}, 0, DOT11F_EID_VHT_TRANSMIT_POWER_ENV, 0, 0, },
{ offsetof(tDot11fProbeResponse, ChannelSwitchWrapper),
offsetof(tDot11fIEChannelSwitchWrapper, present), 0,
"ChannelSwitchWrapper", 0, 2, 14, SigIeChannelSwitchWrapper,
{0, 0, 0, 0, 0}, 0, DOT11F_EID_CHANNELSWITCHWRAPPER, 0, 0, },
{ offsetof(tDot11fProbeResponse, VHTExtBssLoad),
offsetof(tDot11fIEVHTExtBssLoad, present), 0, "VHTExtBssLoad",
0, 7, 7, SigIeVHTExtBssLoad, {0, 0, 0, 0, 0},
@ -11421,10 +11429,6 @@ static const tIEDefn IES_ProbeResponse[] = {
offsetof(tDot11fIEhs20vendor_ie, present), 0, "hs20vendor_ie",
0, 7, 9, SigIehs20vendor_ie, {80, 111, 154, 16, 0},
4, DOT11F_EID_HS20VENDOR_IE, 0, 0, },
{ offsetof(tDot11fProbeResponse, ChannelSwitchWrapper),
offsetof(tDot11fIEChannelSwitchWrapper, present), 0,
"ChannelSwitchWrapper", 0, 2, 14, SigIeChannelSwitchWrapper,
{0, 0, 0, 0, 0}, 0, DOT11F_EID_CHANNELSWITCHWRAPPER, 0, 0, },
{ offsetof(tDot11fProbeResponse, QComVendorIE),
offsetof(tDot11fIEQComVendorIE, present), 0, "QComVendorIE",
0, 7, 7, SigIeQComVendorIE, {0, 160, 198, 0, 0},