qcacld-3.0: Add support for QCN IE in probe request and assoc request

Add QCN IE with version attribute to probe request and assoc/reassoc
request. Add support to detect the QCN IE in beacon, probe response and
assoc/reassoc response.

Change-Id: Ieac62517b09fb5bcd2a1709a352035f422c9ce63
CRs-Fixed: 1116843
This commit is contained in:
Selvaraj, Sridhar 2017-02-02 19:20:16 +05:30 • committed by qcabuildsw
commit c2fe7a3671
6 changed files with 271 additions and 53 deletions

View file

@ -2467,6 +2467,11 @@ IE MBO_IE (EID_VENDOR_SPECIFIC) OUI ( 0x50, 0x6F, 0x9A, 0x16 )
assoc_disallowed[0..3];
}
IE QCN_IE (EID_VENDOR_SPECIFIC) OUI ( 0x8C, 0xFD, 0xF0, 0x01 )
{
version[4];
}
const EID_RRM_BEACON_REPORTING = 1;
const EID_RRM_BCN_REPORTING_DETAIL = 2;
@ -3006,6 +3011,7 @@ FRAME Beacon // C.f. Sec. 7.2.3.1
OPTIE QComVendorIE;
OPTIE ESEVersion;
OPTIE MBO_IE;
OPTIE QCN_IE;
} // End frame Beacon.
// Ok, here's the story on Beacon1 & Beacon2. We presumably beacon a lot
@ -3094,6 +3100,7 @@ FRAME Beacon2
OPTIE ChannelSwitchWrapper;
OPTIE QComVendorIE;
OPTIE ESEVersion;
OPTIE QCN_IE;
}
// This frame is just Beacon with its Fixed Fields stripped out. It's handy
@ -3159,6 +3166,7 @@ FRAME BeaconIEs
OPTIE ChannelSwitchWrapper;
OPTIE QComVendorIE;
OPTIE MBO_IE;
OPTIE QCN_IE;
} // End frame BeaconIEs.
FRAME Disassociation // 7.3.3.3
@ -3198,6 +3206,7 @@ FRAME AssocRequest // 7.2.3.4
OPTIE WFDIEOpaque;
OPTIE vendor_vht_ie;
OPTIE hs20vendor_ie;
OPTIE QCN_IE;
} // End frame AssocRequest.
FRAME AssocResponse // 7.2.3.5
@ -3232,6 +3241,7 @@ FRAME AssocResponse // 7.2.3.5
OPTIE OBSSScanParameters;
OPTIE QosMapSet;
OPTIE vendor_vht_ie;
OPTIE QCN_IE;
} // End frame AssocResponse.
FRAME ReAssocRequest // 7.2.3.6
@ -3320,6 +3330,7 @@ FRAME ProbeRequest // 7.2.3.8
OPTIE P2PProbeReq;
OPTIE VHTCaps;
OPTIE ExtCap;
OPTIE QCN_IE;
} // End frame ProbeRequest.
FRAME ProbeResponse // 7.2.3.9
@ -3378,6 +3389,7 @@ FRAME ProbeResponse // 7.2.3.9
OPTIE QComVendorIE;
OPTIE ESEVersion;
OPTIE MBO_IE;
OPTIE QCN_IE;
} // End frame ProbeResponse.
FRAME Authentication // 7.2.3.10

View file

@ -5772,6 +5772,44 @@ uint32_t dot11f_get_packed_ie_QBSSLoad(
}; /* End extern "C". */
#endif /* C++ */
/* EID 221 (0xdd) {OUI 0x8c, 0xfd, 0xf0, 0x01} */
typedef struct sDot11fIEQCN_IE {
uint8_t present;
uint8_t version[4];
} tDot11fIEQCN_IE;
#define DOT11F_EID_QCN_IE (221)
/* N.B. These #defines do *not* include the EID & length */
#define DOT11F_IE_QCN_IE_MIN_LEN (8)
#define DOT11F_IE_QCN_IE_MAX_LEN (8)
#ifdef __cplusplus
extern "C" {
#endif /* C++ */
uint32_t dot11f_unpack_ie_QCN_IE(
tpAniSirGlobal,
uint8_t *,
uint8_t,
tDot11fIEQCN_IE*);
uint32_t dot11f_pack_ie_QCN_IE(
tpAniSirGlobal,
tDot11fIEQCN_IE *,
uint8_t *,
uint32_t,
uint32_t*);
uint32_t dot11f_get_packed_ie_QCN_IE(
tpAniSirGlobal,
tDot11fIEQCN_IE *,
uint32_t*);
#ifdef __cplusplus
}; /* End extern "C". */
#endif /* C++ */
/* EID 221 (0xdd) {OUI 0x00, 0xa0, 0xc6} */
typedef struct sDot11fIEQComVendorIE {
uint8_t present;
@ -7863,6 +7901,7 @@ typedef struct sDot11fAssocRequest{
tDot11fIEWFDIEOpaque WFDIEOpaque;
tDot11fIEvendor_vht_ie vendor_vht_ie;
tDot11fIEhs20vendor_ie hs20vendor_ie;
tDot11fIEQCN_IE QCN_IE;
} tDot11fAssocRequest;
#define DOT11F_ASSOCREQUEST (3)
@ -7918,6 +7957,7 @@ typedef struct sDot11fAssocResponse{
tDot11fIEOBSSScanParameters OBSSScanParameters;
tDot11fIEQosMapSet QosMapSet;
tDot11fIEvendor_vht_ie vendor_vht_ie;
tDot11fIEQCN_IE QCN_IE;
} tDot11fAssocResponse;
#define DOT11F_ASSOCRESPONSE (4)
@ -8030,6 +8070,7 @@ typedef struct sDot11fBeacon{
tDot11fIEQComVendorIE QComVendorIE;
tDot11fIEESEVersion ESEVersion;
tDot11fIEMBO_IE MBO_IE;
tDot11fIEQCN_IE QCN_IE;
} tDot11fBeacon;
#define DOT11F_BEACON (6)
@ -8124,6 +8165,7 @@ typedef struct sDot11fBeacon2{
tDot11fIEChannelSwitchWrapper ChannelSwitchWrapper;
tDot11fIEQComVendorIE QComVendorIE;
tDot11fIEESEVersion ESEVersion;
tDot11fIEQCN_IE QCN_IE;
} tDot11fBeacon2;
#define DOT11F_BEACON2 (8)
@ -8200,6 +8242,7 @@ typedef struct sDot11fBeaconIEs{
tDot11fIEChannelSwitchWrapper ChannelSwitchWrapper;
tDot11fIEQComVendorIE QComVendorIE;
tDot11fIEMBO_IE MBO_IE;
tDot11fIEQCN_IE QCN_IE;
} tDot11fBeaconIEs;
#define DOT11F_BEACONIES (9)
@ -8537,6 +8580,7 @@ typedef struct sDot11fProbeRequest{
tDot11fIEP2PProbeReq P2PProbeReq;
tDot11fIEVHTCaps VHTCaps;
tDot11fIEExtCap ExtCap;
tDot11fIEQCN_IE QCN_IE;
} tDot11fProbeRequest;
#define DOT11F_PROBEREQUEST (21)
@ -8612,6 +8656,7 @@ typedef struct sDot11fProbeResponse{
tDot11fIEQComVendorIE QComVendorIE;
tDot11fIEESEVersion ESEVersion;
tDot11fIEMBO_IE MBO_IE;
tDot11fIEQCN_IE QCN_IE;
} tDot11fProbeResponse;
#define DOT11F_PROBERESPONSE (22)

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@ -59,6 +59,12 @@
#define NSS_2x2_MODE 2
#define MBO_IE_ASSOC_DISALLOWED_SUBATTR_ID 0x04
/* QCN IE definitions */
#define QCN_IE_VERSION_SUBATTR_ID 1
#define QCN_IE_VERSION_SUBATTR_LEN 2
#define QCN_IE_VERSION_SUPPORTED 1
#define QCN_IE_SUBVERSION_SUPPORTED 0
#define SIZE_OF_FIXED_PARAM 12
#define SIZE_OF_TAG_PARAM_NUM 1
#define SIZE_OF_TAG_PARAM_LEN 1
@ -94,6 +100,12 @@ typedef struct sSirCountryInformation {
} channelTransmitPower[COUNTRY_INFO_MAX_CHANNEL];
} tSirCountryInformation, *tpSirCountryInformation;
typedef struct sSirQCNIE {
bool is_present;
uint8_t version;
uint8_t sub_version;
} tSirQCNIE, *tpSirQCNIE;
/* Structure common to Beacons & Probe Responses */
typedef struct sSirProbeRespBeacon {
tSirMacTimeStamp timeStamp;
@ -182,6 +194,7 @@ typedef struct sSirProbeRespBeacon {
uint8_t MBO_capability;
bool assoc_disallowed;
uint8_t assoc_disallowed_reason;
tSirQCNIE QCN_IE;
} tSirProbeRespBeacon, *tpSirProbeRespBeacon;
/* probe Request structure */
@ -300,6 +313,7 @@ typedef struct sSirAssocRsp {
#endif
tDot11fIEvendor_vht_ie vendor_vht_ie;
tDot11fIEOBSSScanParameters obss_scanparams;
tSirQCNIE QCN_IE;
} tSirAssocRsp, *tpSirAssocRsp;
#ifdef FEATURE_WLAN_ESE
@ -950,6 +964,8 @@ tSirRetStatus
populate_dot11f_ext_cap(tpAniSirGlobal pMac, bool isVHTEnabled,
tDot11fIEExtCap *pDot11f, tpPESession psessionEntry);
void populate_dot11f_qcn_ie(tDot11fIEQCN_IE *pDot11f);
tSirRetStatus
populate_dot11f_operating_mode(tpAniSirGlobal pMac,
tDot11fIEOperatingMode *pDot11f,

View file

@ -346,6 +346,8 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx,
populate_dot11f_ext_cap(mac_ctx, is_vht_enabled, &pr.ExtCap,
pesession);
populate_dot11f_qcn_ie(&pr.QCN_IE);
if (addn_ielen) {
qdf_mem_zero((uint8_t *)&extracted_ext_cap,
sizeof(tDot11fIEExtCap));
@ -1873,6 +1875,8 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
populate_dot11f_ext_cap(mac_ctx, vht_enabled,
&frm->ExtCap, pe_session);
populate_dot11f_qcn_ie(&frm->QCN_IE);
if (pe_session->pLimJoinReq->is11Rconnection) {
tSirBssDescription *bssdescr;

View file

@ -367,9 +367,9 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx,
uint32_t *pnNeeded,
const tIEDefn IEs[]);
static uint32_t dot11f_unpack_tlv_common_func(tpAniSirGlobal pCtx,
uint8_t *pBuf, uint16_t tlvlen,
uint8_t *pDstPresent, uint8_t *pDstField)
static uint32_t dot11f_unpack_tlv_common_func(tpAniSirGlobal pCtx, uint8_t *pBuf,
uint16_t tlvlen, uint8_t *pDstPresent,
uint8_t *pDstField)
{
uint32_t status = DOT11F_PARSE_SUCCESS;
(void)tlvlen; /* Shutup the compiler */
@ -380,9 +380,9 @@ static uint32_t dot11f_unpack_tlv_common_func(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_tlv_common_func. */
static uint32_t dot11f_unpack_tlv_common_func2(tpAniSirGlobal pCtx,
uint8_t *pBuf, uint16_t tlvlen,
uint8_t *pDstPresent, uint16_t *pDstState)
static uint32_t dot11f_unpack_tlv_common_func2(tpAniSirGlobal pCtx, uint8_t *pBuf,
uint16_t tlvlen, uint8_t *pDstPresent,
uint16_t *pDstState)
{
uint32_t status = DOT11F_PARSE_SUCCESS;
(void)tlvlen; /* Shutup the compiler */
@ -4375,6 +4375,24 @@ uint32_t dot11f_unpack_ie_qbss_load(tpAniSirGlobal pCtx,
#define SigIeQBSSLoad (0x0052)
uint32_t dot11f_unpack_ie_QCN_IE(tpAniSirGlobal pCtx,
uint8_t *pBuf,
uint8_t ielen,
tDot11fIEQCN_IE *pDst)
{
uint32_t status = DOT11F_PARSE_SUCCESS;
(void) pBuf; (void)ielen; /* Shutup the compiler */
if (pDst->present)
status = DOT11F_DUPLICATE_IE;
pDst->present = 1;
DOT11F_MEMCPY(pCtx, pDst->version, pBuf, 4);
(void)pCtx;
return status;
} /* End dot11f_unpack_ie_QCN_IE. */
#define SigIeQCN_IE (0x0053)
uint32_t dot11f_unpack_ie_QComVendorIE(tpAniSirGlobal pCtx,
uint8_t *pBuf,
uint8_t ielen,
@ -4393,7 +4411,7 @@ uint32_t dot11f_unpack_ie_QComVendorIE(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_QComVendorIE. */
#define SigIeQComVendorIE (0x0053)
#define SigIeQComVendorIE (0x0054)
uint32_t dot11f_unpack_ie_qos_caps_ap(tpAniSirGlobal pCtx,
@ -4417,7 +4435,7 @@ uint32_t dot11f_unpack_ie_qos_caps_ap(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_qos_caps_ap. */
#define SigIeQOSCapsAp (0x0054)
#define SigIeQOSCapsAp (0x0055)
uint32_t dot11f_unpack_ie_qos_caps_station(tpAniSirGlobal pCtx,
@ -4443,7 +4461,7 @@ uint32_t dot11f_unpack_ie_qos_caps_station(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_qos_caps_station. */
#define SigIeQOSCapsStation (0x0055)
#define SigIeQOSCapsStation (0x0056)
uint32_t dot11f_unpack_ie_qos_map_set(tpAniSirGlobal pCtx,
@ -4467,7 +4485,7 @@ uint32_t dot11f_unpack_ie_qos_map_set(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_qos_map_set. */
#define SigIeQosMapSet (0x0056)
#define SigIeQosMapSet (0x0057)
uint32_t dot11f_unpack_ie_quiet(tpAniSirGlobal pCtx,
@ -4494,7 +4512,7 @@ uint32_t dot11f_unpack_ie_quiet(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_quiet. */
#define SigIeQuiet (0x0057)
#define SigIeQuiet (0x0058)
uint32_t dot11f_unpack_ie_rcpiie(tpAniSirGlobal pCtx,
@ -4512,7 +4530,7 @@ uint32_t dot11f_unpack_ie_rcpiie(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_rcpiie. */
#define SigIeRCPIIE (0x0058)
#define SigIeRCPIIE (0x0059)
static const tFFDefn FFS_RICDataDesc[] = {
@ -4586,7 +4604,7 @@ uint32_t dot11f_unpack_ie_ric_data_desc(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_ric_data_desc. */
#define SigIeRICDataDesc (0x0059)
#define SigIeRICDataDesc (0x005a)
uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx,
@ -4677,7 +4695,7 @@ uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_rsn. */
#define SigIeRSN (0x005a)
#define SigIeRSN (0x005b)
uint32_t dot11f_unpack_ie_rsniie(tpAniSirGlobal pCtx,
@ -4695,7 +4713,7 @@ uint32_t dot11f_unpack_ie_rsniie(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_rsniie. */
#define SigIeRSNIIE (0x005b)
#define SigIeRSNIIE (0x005c)
uint32_t dot11f_unpack_ie_rsn_opaque(tpAniSirGlobal pCtx,
@ -4719,7 +4737,7 @@ uint32_t dot11f_unpack_ie_rsn_opaque(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_rsn_opaque. */
#define SigIeRSNOpaque (0x005c)
#define SigIeRSNOpaque (0x005d)
uint32_t dot11f_unpack_ie_supp_channels(tpAniSirGlobal pCtx,
@ -4743,7 +4761,7 @@ uint32_t dot11f_unpack_ie_supp_channels(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_supp_channels. */
#define SigIeSuppChannels (0x005d)
#define SigIeSuppChannels (0x005e)
uint32_t dot11f_unpack_ie_supp_operating_classes(tpAniSirGlobal pCtx,
@ -4767,7 +4785,7 @@ uint32_t dot11f_unpack_ie_supp_operating_classes(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_supp_operating_classes. */
#define SigIeSuppOperatingClasses (0x005e)
#define SigIeSuppOperatingClasses (0x005f)
uint32_t dot11f_unpack_ie_supp_rates(tpAniSirGlobal pCtx,
@ -4799,7 +4817,7 @@ uint32_t dot11f_unpack_ie_supp_rates(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_supp_rates. */
#define SigIeSuppRates (0x005f)
#define SigIeSuppRates (0x0060)
uint32_t dot11f_unpack_ie_tim(tpAniSirGlobal pCtx,
@ -4832,7 +4850,7 @@ uint32_t dot11f_unpack_ie_tim(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_tim. */
#define SigIeTIM (0x0060)
#define SigIeTIM (0x0061)
uint32_t dot11f_unpack_ie_tpc_report(tpAniSirGlobal pCtx,
@ -4853,7 +4871,7 @@ uint32_t dot11f_unpack_ie_tpc_report(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_tpc_report. */
#define SigIeTPCReport (0x0061)
#define SigIeTPCReport (0x0062)
uint32_t dot11f_unpack_ie_tpc_request(tpAniSirGlobal pCtx,
@ -4870,7 +4888,7 @@ uint32_t dot11f_unpack_ie_tpc_request(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_tpc_request. */
#define SigIeTPCRequest (0x0062)
#define SigIeTPCRequest (0x0063)
uint32_t dot11f_unpack_ie_time_advertisement(tpAniSirGlobal pCtx,
@ -4894,7 +4912,7 @@ uint32_t dot11f_unpack_ie_time_advertisement(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_time_advertisement. */
#define SigIeTimeAdvertisement (0x0063)
#define SigIeTimeAdvertisement (0x0064)
uint32_t dot11f_unpack_ie_timeout_interval(tpAniSirGlobal pCtx,
@ -4915,7 +4933,7 @@ uint32_t dot11f_unpack_ie_timeout_interval(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_timeout_interval. */
#define SigIeTimeoutInterval (0x0064)
#define SigIeTimeoutInterval (0x0065)
uint32_t dot11f_unpack_ie_vht_ext_bss_load(tpAniSirGlobal pCtx,
@ -4945,7 +4963,7 @@ uint32_t dot11f_unpack_ie_vht_ext_bss_load(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_vht_ext_bss_load. */
#define SigIeVHTExtBssLoad (0x0065)
#define SigIeVHTExtBssLoad (0x0066)
uint32_t dot11f_unpack_ie_vendor1_ie(tpAniSirGlobal pCtx,
@ -4962,7 +4980,7 @@ uint32_t dot11f_unpack_ie_vendor1_ie(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_vendor1_ie. */
#define SigIeVendor1IE (0x0066)
#define SigIeVendor1IE (0x0067)
uint32_t dot11f_unpack_ie_vendor3_ie(tpAniSirGlobal pCtx,
@ -4979,7 +4997,7 @@ uint32_t dot11f_unpack_ie_vendor3_ie(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_vendor3_ie. */
#define SigIeVendor3IE (0x0067)
#define SigIeVendor3IE (0x0068)
uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx,
@ -5048,7 +5066,7 @@ uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wapi. */
#define SigIeWAPI (0x0068)
#define SigIeWAPI (0x0069)
uint32_t dot11f_unpack_ie_wapi_opaque(tpAniSirGlobal pCtx,
@ -5072,7 +5090,7 @@ uint32_t dot11f_unpack_ie_wapi_opaque(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wapi_opaque. */
#define SigIeWAPIOpaque (0x0069)
#define SigIeWAPIOpaque (0x006a)
uint32_t dot11f_unpack_ie_wfatpc(tpAniSirGlobal pCtx,
@ -5093,7 +5111,7 @@ uint32_t dot11f_unpack_ie_wfatpc(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wfatpc. */
#define SigIeWFATPC (0x006a)
#define SigIeWFATPC (0x006b)
uint32_t dot11f_unpack_ie_wfdie_opaque(tpAniSirGlobal pCtx,
@ -5117,7 +5135,7 @@ uint32_t dot11f_unpack_ie_wfdie_opaque(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wfdie_opaque. */
#define SigIeWFDIEOpaque (0x006b)
#define SigIeWFDIEOpaque (0x006c)
uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx,
@ -5148,7 +5166,7 @@ uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wmm_caps. */
#define SigIeWMMCaps (0x006c)
#define SigIeWMMCaps (0x006d)
uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx,
@ -5173,7 +5191,7 @@ uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wmm_info_ap. */
#define SigIeWMMInfoAp (0x006d)
#define SigIeWMMInfoAp (0x006e)
uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx,
@ -5202,7 +5220,7 @@ uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wmm_info_station. */
#define SigIeWMMInfoStation (0x006e)
#define SigIeWMMInfoStation (0x006f)
uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx,
@ -5298,7 +5316,7 @@ uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wmm_params. */
#define SigIeWMMParams (0x006f)
#define SigIeWMMParams (0x0070)
uint32_t dot11f_unpack_ie_wpa(tpAniSirGlobal pCtx,
@ -5371,7 +5389,7 @@ uint32_t dot11f_unpack_ie_wpa(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wpa. */
#define SigIeWPA (0x0070)
#define SigIeWPA (0x0071)
uint32_t dot11f_unpack_ie_wpa_opaque(tpAniSirGlobal pCtx,
@ -5395,7 +5413,7 @@ uint32_t dot11f_unpack_ie_wpa_opaque(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wpa_opaque. */
#define SigIeWPAOpaque (0x0071)
#define SigIeWPAOpaque (0x0072)
static const tTLVDefn TLVS_WSC[] = {
@ -5485,7 +5503,7 @@ uint32_t dot11f_unpack_ie_wsc(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wsc. */
#define SigIeWSC (0x0072)
#define SigIeWSC (0x0073)
static const tTLVDefn TLVS_WscAssocReq[] = {
@ -5516,7 +5534,7 @@ uint32_t dot11f_unpack_ie_wsc_assoc_req(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wsc_assoc_req. */
#define SigIeWscAssocReq (0x0073)
#define SigIeWscAssocReq (0x0074)
static const tTLVDefn TLVS_WscAssocRes[] = {
@ -5547,7 +5565,7 @@ uint32_t dot11f_unpack_ie_wsc_assoc_res(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wsc_assoc_res. */
#define SigIeWscAssocRes (0x0074)
#define SigIeWscAssocRes (0x0075)
static const tTLVDefn TLVS_WscBeacon[] = {
@ -5599,7 +5617,7 @@ uint32_t dot11f_unpack_ie_wsc_beacon(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wsc_beacon. */
#define SigIeWscBeacon (0x0075)
#define SigIeWscBeacon (0x0076)
static const tTLVDefn TLVS_WscBeaconProbeRes[] = {
@ -5676,7 +5694,7 @@ uint32_t dot11f_unpack_ie_wsc_beacon_probe_res(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wsc_beacon_probe_res. */
#define SigIeWscBeaconProbeRes (0x0076)
#define SigIeWscBeaconProbeRes (0x0077)
uint32_t dot11f_unpack_ie_wsc_ie_opaque(tpAniSirGlobal pCtx,
@ -5700,7 +5718,7 @@ uint32_t dot11f_unpack_ie_wsc_ie_opaque(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wsc_ie_opaque. */
#define SigIeWscIEOpaque (0x0077)
#define SigIeWscIEOpaque (0x0078)
static const tTLVDefn TLVS_WscProbeReq[] = {
@ -5772,7 +5790,7 @@ uint32_t dot11f_unpack_ie_wsc_probe_req(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wsc_probe_req. */
#define SigIeWscProbeReq (0x0078)
#define SigIeWscProbeReq (0x0079)
static const tTLVDefn TLVS_WscProbeRes[] = {
@ -5849,7 +5867,7 @@ uint32_t dot11f_unpack_ie_wsc_probe_res(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wsc_probe_res. */
#define SigIeWscProbeRes (0x0079)
#define SigIeWscProbeRes (0x007a)
static const tTLVDefn TLVS_WscReassocRes[] = {
@ -5880,7 +5898,7 @@ uint32_t dot11f_unpack_ie_wsc_reassoc_res(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_wsc_reassoc_res. */
#define SigIeWscReassocRes (0x007a)
#define SigIeWscReassocRes (0x007b)
uint32_t dot11f_unpack_ie_ext_chan_switch_ann(tpAniSirGlobal pCtx,
@ -5907,7 +5925,7 @@ uint32_t dot11f_unpack_ie_ext_chan_switch_ann(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_ext_chan_switch_ann. */
#define SigIeext_chan_switch_ann (0x007b)
#define SigIeext_chan_switch_ann (0x007c)
uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx,
@ -5948,7 +5966,7 @@ uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_hs20vendor_ie. */
#define SigIehs20vendor_ie (0x007c)
#define SigIehs20vendor_ie (0x007d)
uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx,
@ -5973,7 +5991,7 @@ uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_ht2040_bss_coexistence. */
#define SigIeht2040_bss_coexistence (0x007d)
#define SigIeht2040_bss_coexistence (0x007e)
uint32_t dot11f_unpack_ie_ht2040_bss_intolerant_report(tpAniSirGlobal pCtx,
@ -6000,7 +6018,7 @@ uint32_t dot11f_unpack_ie_ht2040_bss_intolerant_report(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_ht2040_bss_intolerant_report. */
#define SigIeht2040_bss_intolerant_report (0x007e)
#define SigIeht2040_bss_intolerant_report (0x007f)
uint32_t dot11f_unpack_ie_sec_chan_offset_ele(tpAniSirGlobal pCtx,
@ -6018,7 +6036,7 @@ uint32_t dot11f_unpack_ie_sec_chan_offset_ele(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_sec_chan_offset_ele. */
#define SigIesec_chan_offset_ele (0x007f)
#define SigIesec_chan_offset_ele (0x0080)
static const tFFDefn FFS_vendor_vht_ie[] = {
@ -6063,7 +6081,7 @@ uint32_t dot11f_unpack_ie_vendor_vht_ie(tpAniSirGlobal pCtx,
return status;
} /* End dot11f_unpack_ie_vendor_vht_ie. */
#define SigIevendor_vht_ie (0x0080)
#define SigIevendor_vht_ie (0x0081)
static const tFFDefn FFS_AddTSRequest[] = {
@ -6292,6 +6310,9 @@ static const tIEDefn IES_AssocRequest[] = {
offsetof(tDot11fIEhs20vendor_ie, present), 0, "hs20vendor_ie",
0, 7, 9, SigIehs20vendor_ie, {80, 111, 154, 16, 0},
4, DOT11F_EID_HS20VENDOR_IE, 0, },
{ offsetof(tDot11fAssocRequest, QCN_IE), offsetof(tDot11fIEQCN_IE,
present), 0, "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0},
4, DOT11F_EID_QCN_IE, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },};
uint32_t dot11f_unpack_assoc_request(tpAniSirGlobal pCtx,
@ -6416,6 +6437,9 @@ static const tIEDefn IES_AssocResponse[] = {
offsetof(tDot11fIEvendor_vht_ie, present), 0, "vendor_vht_ie",
0, 7, 28, SigIevendor_vht_ie, {0, 144, 76, 0, 0},
3, DOT11F_EID_VENDOR_VHT_IE, 0, },
{ offsetof(tDot11fAssocResponse, QCN_IE), offsetof(tDot11fIEQCN_IE,
present), 0, "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0},
4, DOT11F_EID_QCN_IE, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },};
uint32_t dot11f_unpack_assoc_response(tpAniSirGlobal pCtx,
@ -6667,6 +6691,9 @@ static const tIEDefn IES_Beacon[] = {
{ offsetof(tDot11fBeacon, MBO_IE), offsetof(tDot11fIEMBO_IE, present), 0,
"MBO_IE", 0, 9, 12, SigIeMBO_IE, {80, 111, 154, 22, 0},
4, DOT11F_EID_MBO_IE, 0, },
{ offsetof(tDot11fBeacon, QCN_IE), offsetof(tDot11fIEQCN_IE, present), 0,
"QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0},
4, DOT11F_EID_QCN_IE, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },};
uint32_t dot11f_unpack_beacon(tpAniSirGlobal pCtx,
@ -6866,6 +6893,9 @@ static const tIEDefn IES_Beacon2[] = {
{ offsetof(tDot11fBeacon2, ESEVersion), offsetof(tDot11fIEESEVersion,
present), 0, "ESEVersion", 0, 7, 7, SigIeESEVersion, {0, 64, 150, 3, 0},
4, DOT11F_EID_ESEVERSION, 0, },
{ offsetof(tDot11fBeacon2, QCN_IE), offsetof(tDot11fIEQCN_IE, present), 0,
"QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0},
4, DOT11F_EID_QCN_IE, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },};
uint32_t dot11f_unpack_beacon2(tpAniSirGlobal pCtx,
@ -7065,6 +7095,9 @@ static const tIEDefn IES_BeaconIEs[] = {
{ offsetof(tDot11fBeaconIEs, MBO_IE), offsetof(tDot11fIEMBO_IE, present),
0, "MBO_IE", 0, 9, 12, SigIeMBO_IE, {80, 111, 154, 22, 0},
4, DOT11F_EID_MBO_IE, 0, },
{ offsetof(tDot11fBeaconIEs, QCN_IE), offsetof(tDot11fIEQCN_IE, present),
0, "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0},
4, DOT11F_EID_QCN_IE, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },};
uint32_t dot11f_unpack_beacon_i_es(tpAniSirGlobal pCtx,
@ -7479,6 +7512,9 @@ static const tIEDefn IES_ProbeRequest[] = {
{ offsetof(tDot11fProbeRequest, ExtCap), offsetof(tDot11fIEExtCap,
present), 0, "ExtCap", 0, 3, 11, SigIeExtCap, {0, 0, 0, 0, 0},
0, DOT11F_EID_EXTCAP, 0, },
{ offsetof(tDot11fProbeRequest, QCN_IE), offsetof(tDot11fIEQCN_IE,
present), 0, "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0},
4, DOT11F_EID_QCN_IE, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },};
uint32_t dot11f_unpack_probe_request(tpAniSirGlobal pCtx,
@ -7678,6 +7714,9 @@ static const tIEDefn IES_ProbeResponse[] = {
{ offsetof(tDot11fProbeResponse, MBO_IE), offsetof(tDot11fIEMBO_IE,
present), 0, "MBO_IE", 0, 9, 12, SigIeMBO_IE, {80, 111, 154, 22, 0},
4, DOT11F_EID_MBO_IE, 0, },
{ offsetof(tDot11fProbeResponse, QCN_IE), offsetof(tDot11fIEQCN_IE,
present), 0, "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0},
4, DOT11F_EID_QCN_IE, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },};
uint32_t dot11f_unpack_probe_response(tpAniSirGlobal pCtx,
@ -10106,6 +10145,15 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx,
sizeof(tDot11fIEQBSSLoad) *
countOffset));
break;
case SigIeQCN_IE:
status |=
dot11f_unpack_ie_QCN_IE(
pCtx, pBufRemaining, len,
(tDot11fIEQCN_IE *)
(pFrm + pIe->offset +
sizeof(tDot11fIEQCN_IE) *
countOffset));
break;
case SigIeQComVendorIE:
status |=
dot11f_unpack_ie_QComVendorIE(
@ -12886,6 +12934,13 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx,
(pFrm + pIe->offset + offset * i))->
present;
break;
case SigIeQCN_IE:
offset = sizeof(tDot11fIEQCN_IE);
byteCount = 4;
pIePresent = ((tDot11fIEQCN_IE *)
(pFrm + pIe->offset + offset * i))->
present;
break;
case SigIeQComVendorIE:
offset = sizeof(tDot11fIEQComVendorIE);
byteCount = 2;
@ -18851,6 +18906,43 @@ uint32_t dot11f_pack_ie_qbss_load(tpAniSirGlobal pCtx,
return DOT11F_PARSE_SUCCESS;
} /* End dot11f_pack_ie_qbss_load. */
uint32_t dot11f_pack_ie_QCN_IE(tpAniSirGlobal pCtx,
tDot11fIEQCN_IE *pSrc,
uint8_t *pBuf,
uint32_t nBuf,
uint32_t *pnConsumed)
{
uint8_t *pIeLen = 0;
uint32_t nConsumedOnEntry = *pnConsumed;
uint32_t nNeeded = 0U;
nNeeded += 4;
while (pSrc->present) {
if (nNeeded > nBuf)
return DOT11F_BUFFER_OVERFLOW;
*pBuf = 221;
++pBuf; ++(*pnConsumed);
pIeLen = pBuf;
++pBuf; ++(*pnConsumed);
*pBuf = 0x8c;
++pBuf; ++(*pnConsumed);
*pBuf = 0xfd;
++pBuf; ++(*pnConsumed);
*pBuf = 0xf0;
++pBuf; ++(*pnConsumed);
*pBuf = 0x1;
++pBuf; ++(*pnConsumed);
DOT11F_MEMCPY(pCtx, pBuf, pSrc->version, 4);
*pnConsumed += 4;
/* fieldsEndFlag = 1 */
break;
}
(void)pCtx;
if (pIeLen) {
*pIeLen = *pnConsumed - nConsumedOnEntry - 2;
}
return DOT11F_PARSE_SUCCESS;
} /* End dot11f_pack_ie_QCN_IE. */
uint32_t dot11f_pack_ie_QComVendorIE(tpAniSirGlobal pCtx,
tDot11fIEQComVendorIE *pSrc,
uint8_t *pBuf,
@ -22483,6 +22575,14 @@ static uint32_t pack_core(tpAniSirGlobal pCtx,
sizeof(tDot11fIEQBSSLoad) * i),
pBufRemaining, nBufRemaining, &len);
break;
case SigIeQCN_IE:
status |=
dot11f_pack_ie_QCN_IE(
pCtx, (tDot11fIEQCN_IE *)
(pSrc + pIe->offset +
sizeof(tDot11fIEQCN_IE) * i),
pBufRemaining, nBufRemaining, &len);
break;
case SigIeQComVendorIE:
status |=
dot11f_pack_ie_QComVendorIE(

View file

@ -1265,6 +1265,15 @@ populate_dot11f_ext_cap(tpAniSirGlobal pMac,
return eSIR_SUCCESS;
}
void populate_dot11f_qcn_ie(tDot11fIEQCN_IE *pDot11f)
{
pDot11f->present = 1;
pDot11f->version[0] = QCN_IE_VERSION_SUBATTR_ID;
pDot11f->version[1] = QCN_IE_VERSION_SUBATTR_LEN;
pDot11f->version[2] = QCN_IE_VERSION_SUPPORTED;
pDot11f->version[3] = QCN_IE_SUBVERSION_SUPPORTED;
}
tSirRetStatus
populate_dot11f_operating_mode(tpAniSirGlobal pMac,
tDot11fIEOperatingMode *pDot11f,
@ -2611,6 +2620,17 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac,
}
}
if (pr->QCN_IE.present) {
pProbeResp->QCN_IE.is_present = true;
if (pr->QCN_IE.version[0] == QCN_IE_VERSION_SUBATTR_ID) {
pProbeResp->QCN_IE.version
= pr->QCN_IE.version[2];
pProbeResp->QCN_IE.sub_version
= pr->QCN_IE.version[3];
}
}
qdf_mem_free(pr);
return eSIR_SUCCESS;
@ -3806,6 +3826,16 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac,
}
}
if (pBies->QCN_IE.present) {
pBeaconStruct->QCN_IE.is_present = true;
if (pBies->QCN_IE.version[0] == QCN_IE_VERSION_SUBATTR_ID) {
pBeaconStruct->QCN_IE.version
= pBies->QCN_IE.version[2];
pBeaconStruct->QCN_IE.sub_version
= pBies->QCN_IE.version[3];
}
}
qdf_mem_free(pBies);
return eSIR_SUCCESS;
} /* End sir_parse_beacon_ie. */
@ -4173,6 +4203,17 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac,
}
}
if (pBeacon->QCN_IE.present) {
pBeaconStruct->QCN_IE.is_present = true;
if (pBeacon->QCN_IE.version[0]
== QCN_IE_VERSION_SUBATTR_ID) {
pBeaconStruct->QCN_IE.version
= pBeacon->QCN_IE.version[2];
pBeaconStruct->QCN_IE.sub_version
= pBeacon->QCN_IE.version[3];
}
}
qdf_mem_free(pBeacon);
return eSIR_SUCCESS;