diff options
| author | Srinivas Girigowda <sgirigow@qca.qualcomm.com> | 2014-08-25 14:44:25 -0700 |
|---|---|---|
| committer | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2014-09-29 19:40:16 +0530 |
| commit | cb14ce3ab2baec52ca82f7452f152966a74b7828 (patch) | |
| tree | a66aff8d2b9201742515fa5946f54fcbd52b83ea | |
| parent | 8f7528489da31731869d64cdf7b5112dbcd504ca (diff) | |
qcacld: Remove obsolete polaris/taurus/titan prop rates/IEs
We no longer support Polaris/Taurus/Titan proprietary rates/IEs.
Hence remove obsolete code.
Change-Id: I356254600deeab1736fb404ef6e86c7a0ef1a6fa
CRs-Fixed: 710613
54 files changed, 1919 insertions, 15806 deletions
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c index a734c9032a62..357637d9ff79 100644 --- a/CORE/HDD/src/wlan_hdd_wext.c +++ b/CORE/HDD/src/wlan_hdd_wext.c @@ -7180,10 +7180,6 @@ static int iw_get_char_setnone(struct net_device *dev, struct iw_request_info *i case eCSR_DOT11_MODE_AUTO: snprintf(extra, WE_MAX_STR_LEN, "AUTO MODE"); break; - case eCSR_DOT11_MODE_TAURUS: - case eCSR_DOT11_MODE_POLARIS: - case eCSR_DOT11_MODE_TAURUS_ONLY: - case eCSR_DOT11_MODE_TITAN: case eCSR_DOT11_MODE_11n: case eCSR_DOT11_MODE_11n_ONLY: if (currBand == eCSR_BAND_24) { @@ -11026,7 +11022,7 @@ int hdd_set_wext(hdd_adapter_t *pAdapter) pwextBuf->roamProfile.AuthType.numEntries = 1; pwextBuf->roamProfile.AuthType.authType[0] = eCSR_AUTH_TYPE_OPEN_SYSTEM; - pwextBuf->roamProfile.phyMode = eCSR_DOT11_MODE_TAURUS; + pwextBuf->roamProfile.phyMode = eCSR_DOT11_MODE_AUTO; pwextBuf->wpaVersion = IW_AUTH_WPA_VERSION_DISABLED; /*Set the default scan mode*/ diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h index 8ff49725a887..cc589eca3ce7 100644 --- a/CORE/MAC/inc/aniGlobal.h +++ b/CORE/MAC/inc/aniGlobal.h @@ -577,11 +577,6 @@ typedef struct sAniSirLim ////////////////////////////////////////// MISC RELATED START /////////////////////////////////////////// - // WDS info - tANI_U32 gLimNumWdsInfoInd; - tANI_U32 gLimNumWdsInfoSet; - tSirWdsInfo gLimWdsInfo; - /* Deferred Queue Parameters */ tLimDeferredMsgQParams gLimDeferredMsgQ; @@ -698,39 +693,6 @@ typedef struct sAniSirLim ////////////////////////////////////////// ASSOC RELATED END /////////////////////////////////////////// - - - // - // For DEBUG purposes - // Primarily for - TITAN BEACON workaround - // Symptom - TFP/PHY gets stuck - // - tANI_U32 gLimScanOverride; - // Holds the desired tSirScanType, as requested by SME - tSirScanType gLimScanOverrideSaved; - - // - // CB State protection, operated upon as follows: - // 1 - CB is enabled in the hardware ONLY WHEN a Titan - // STA associates with the AP - // 0 - CB is enabled/disabled based on the configuration - // received as per eWNI_SME_START_BSS_REQ - // - tANI_U32 gLimCBStateProtection; - - // Count of TITAN STA's currently associated - tANI_U16 gLimTitanStaCount; - - // - // For DEBUG purposes - // Primarily for - TITAN workaround - // Symptom - Avoid NULL data frames - // Applies to AP only - // - tANI_U32 gLimBlockNonTitanSta; - /////////////////////////// TITAN related globals ////////////////////////////////////////// - - //////////////////////////////// HT RELATED ////////////////////////////////////////// // // The following global LIM variables maintain/manage diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h index f33811e01a92..b29926564f3b 100644 --- a/CORE/MAC/inc/sirApi.h +++ b/CORE/MAC/inc/sirApi.h @@ -74,16 +74,6 @@ #define SIR_NUM_11B_RATES 4 //1,2,5.5,11 #define SIR_NUM_11A_RATES 8 //6,9,12,18,24,36,48,54 -#define SIR_NUM_POLARIS_RATES 3 //72,96,108 -#define SIR_NUM_TITAN_RATES 26 -#define SIR_NUM_TAURUS_RATES 4 //136.5, 151.7,283.5,315 -#define SIR_NUM_PROP_RATES (SIR_NUM_TITAN_RATES + SIR_NUM_TAURUS_RATES) - -#define SIR_CONVERT_2_U32_BITMAP(nRates) ((nRates + 31)/32) - -/* #tANI_U32's needed for a bitmap representation for all prop rates */ -#define SIR_NUM_U32_MAP_RATES SIR_CONVERT_2_U32_BITMAP(SIR_NUM_PROP_RATES) - #define SIR_PM_SLEEP_MODE 0 #define SIR_PM_ACTIVE_MODE 1 @@ -306,7 +296,6 @@ typedef enum eSirResultCodes eSIR_SME_LINK_TEST_INVALID_STATE, // Given in LINK_TEST_START_RSP eSIR_SME_LINK_TEST_TERMINATE, // Given in LINK_TEST_START_RSP eSIR_SME_LINK_TEST_INVALID_ADDRESS, // Given in LINK_TEST_STOP_RSP - eSIR_SME_POLARIS_RESET, // Given in SME_STOP_BSS_REQ eSIR_SME_SETCONTEXT_FAILED, // Given in SME_SETCONTEXT_REQ when // unable to plumb down keys eSIR_SME_BSS_RESTART, // Given in SME_STOP_BSS_REQ @@ -374,9 +363,6 @@ typedef enum eSirResultCodes /* each station added has a rate mode which specifies the sta attributes */ typedef enum eStaRateMode { - eSTA_TAURUS = 0, - eSTA_TITAN, - eSTA_POLARIS, eSTA_11b, eSTA_11bg, eSTA_11a, @@ -392,7 +378,6 @@ typedef enum eStaRateMode { #define IERATE_BASICRATE_MASK 0x80 #define IERATE_RATE_MASK 0x7f #define IERATE_IS_BASICRATE(x) ((x) & IERATE_BASICRATE_MASK) -#define ANIENHANCED_TAURUS_RATEMAP_BITOFFSET_START 28 typedef struct sSirSupportedRates { /* @@ -411,12 +396,6 @@ typedef struct sSirSupportedRates { // 11b, 11a and aniLegacyRates are IE rates which gives rate in unit of 500Kbps tANI_U16 llbRates[SIR_NUM_11B_RATES]; tANI_U16 llaRates[SIR_NUM_11A_RATES]; - tANI_U16 aniLegacyRates[SIR_NUM_POLARIS_RATES]; - - //Taurus only supports 26 Titan Rates(no ESF/concat Rates will be supported) - //First 26 bits are reserved for those Titan rates and - //the last 4 bits(bit28-31) for Taurus, 2(bit26-27) bits are reserved. - tANI_U32 aniEnhancedRateBitmap; //Titan and Taurus Rates /* * 0-76 bits used, remaining reserved @@ -492,23 +471,6 @@ typedef struct sSirRegisterMgmtFrame tANI_U8 matchData[1]; }tSirRegisterMgmtFrame, *tpSirRegisterMgmtFrame; -/* - * Identifies the neighbor BSS' that was(were) detected - * by an STA and reported to the AP - */ -typedef struct sAniTitanCBNeighborInfo -{ - // A BSS was found on the Primary - tANI_U8 cbBssFoundPri; - - // A BSS was found on the adjacent Upper Secondary - tANI_U8 cbBssFoundSecUp; - - // A BSS was found on the adjacent Lower Secondary - tANI_U8 cbBssFoundSecDown; - -} tAniTitanCBNeighborInfo, *tpAniTitanCBNeighborInfo; - /// Generic type for sending a response message /// with result code to host software typedef struct sSirSmeRsp @@ -528,7 +490,6 @@ typedef struct sSirSmeStartReq tANI_U8 sessionId; //Added for BT-AMP Support tANI_U16 transcationId; //Added for BT-AMP Support tSirMacAddr bssId; //Added For BT-AMP Support - tANI_U32 roamingAtPolaris; tANI_U32 sendNewBssInd; } tSirSmeStartReq, *tpSirSmeStartReq; @@ -569,13 +530,6 @@ typedef enum eSirBssType eSIR_DONOT_USE_BSS_TYPE = SIR_MAX_ENUM_SIZE } tSirBssType; -/// Definition for WDS Information -typedef struct sSirWdsInfo -{ - tANI_U16 wdsLength; - tANI_U8 wdsBytes[ANI_WDS_INFO_MAX_LENGTH]; -} tSirWdsInfo, *tpSirWdsInfo; - /// Power Capability info used in 11H typedef struct sSirMacPowerCapInfo { @@ -1039,7 +993,6 @@ typedef struct sSirBackgroundScanInfo { /* Definition for Join/Reassoc info */ typedef struct sJoinReassocInfo { - tAniTitanCBNeighborInfo cbNeighbors; tAniBool spectrumMgtIndicator; tSirMacPowerCapInfo powerCap; tSirSupChnl supportedChannels; @@ -1133,7 +1086,6 @@ typedef struct sSirSmeJoinReq tAniBool isWMEenabled; tAniBool isQosEnabled; tAniBool isOSENConnection; - tAniTitanCBNeighborInfo cbNeighbors; tAniBool spectrumMgtIndicator; tSirMacPowerCapInfo powerCap; tSirSupChnl supportedChannels; @@ -1399,7 +1351,6 @@ typedef struct sSirSmeWmStatusChangeNtf tSirNewIbssPeerInfo newIbssPeerInfo; // eSIR_SME_IBSS_NEW_PEER tSirSmeApNewCaps apNewCaps; // eSIR_SME_AP_CAPS_CHANGED tSirBackgroundScanInfo bkgndScanInfo; // eSIR_SME_BACKGROUND_SCAN_FAIL - tAniTitanCBNeighborInfo cbNeighbors; // eSIR_SME_CB_LEGACY_BSS_FOUND_BY_STA } statusChangeInfo; } tSirSmeWmStatusChangeNtf, *tpSirSmeWmStatusChangeNtf; @@ -1519,15 +1470,6 @@ typedef struct sAniStaStatStruct tANI_U32 nRcvBytes; tANI_U32 nXmitBytes; - // titan 3c stats - tANI_U32 chunksTxCntHi; // Number of Chunks Transmitted - tANI_U32 chunksTxCntLo; - tANI_U32 compPktRxCntHi; // Number of Packets Received that were actually compressed - tANI_U32 compPktRxCntLo; - tANI_U32 expanPktRxCntHi; // Number of Packets Received that got expanded - tANI_U32 expanPktRxCntLo; - - /* Following elements are valid and filled in correctly. They have valid values. */ @@ -1626,19 +1568,9 @@ typedef struct _sPermStaStats tANI_U32 fragTxCntsLo; tANI_U32 transmittedPktsHi; tANI_U32 transmittedPktsLo; - - // titan 3c stats - tANI_U32 chunksTxCntHi; // Number of Chunks Transmitted - tANI_U32 chunksTxCntLo; - tANI_U32 compPktRxCntHi; // Number of Packets Received that were actually compressed - tANI_U32 compPktRxCntLo; - tANI_U32 expanPktRxCntHi; // Number of Packets Received that got expanded - tANI_U32 expanPktRxCntLo; }tPermanentStaStats; - - /// Definition for Disassociation response typedef struct sSirSmeDisassocRsp { @@ -1986,18 +1918,6 @@ typedef struct sAniTxCtrs tANI_U32 ackFailureHi; tANI_U32 ackFailureLo; tANI_U32 xmitBeacons; - - // titan 3c stats - tANI_U32 txCbEscPktCntHi; // Total Number of Channel Bonded/Escort Packet Transmitted - tANI_U32 txCbEscPktCntLo; - tANI_U32 txChunksCntHi; // Total Number of Chunks Transmitted - tANI_U32 txChunksCntLo; - tANI_U32 txCompPktCntHi; // Total Number of Compresssed Packet Transmitted - tANI_U32 txCompPktCntLo; - tANI_U32 tx50PerCompPktCntHi; // Total Number of Packets with 50% or more compression - tANI_U32 tx50PerCompPktCntLo; - tANI_U32 txExpanPktCntHi; // Total Number of Packets Transmitted that got expanded - tANI_U32 txExpanPktCntLo; } tAniTxCtrs, *tpAniTxCtrs; typedef struct sAniRxCtrs @@ -2042,14 +1962,6 @@ typedef struct sAniRxCtrs tANI_U32 aesFormatErrorUcastCnts; tANI_U32 aesReplaysUcast; tANI_U32 aesDecryptErrUcast; - - // titan 3c stats - tANI_U32 rxDecompPktCntHi; // Total Number of Packets that got decompressed - tANI_U32 rxDecompPktCntLo; - tANI_U32 rxCompPktCntHi; // Total Number of Packets received that were actually compressed - tANI_U32 rxCompPktCntLo; - tANI_U32 rxExpanPktCntHi; // Total Number of Packets received that got expanded - tANI_U32 rxExpanPktCntLo; } tAniRxCtrs, *tpAniRxCtrs; // Radio stats diff --git a/CORE/MAC/inc/sirMacPropExts.h b/CORE/MAC/inc/sirMacPropExts.h index af9ddc983a9e..369619096d4f 100644 --- a/CORE/MAC/inc/sirMacPropExts.h +++ b/CORE/MAC/inc/sirMacPropExts.h @@ -45,56 +45,24 @@ /// EID (Element ID) definitions -// Proprietary IEs - -// the bit map is also used as a config enable, setting a bit in the -// propIE config variable, enables the corresponding capability in the propIE -// the enables simply result in including the corresponding element in the -// propIE -// Ex: setting the capability bit HCF would result in using the capability bit map for -// hcf instead of including the full HCF element in the IE -// capabilities bit map - bit offsets -// setting 11eQos has effect only if QoS is also enabled. then it overrides -// 11e support and implements it silently (as part of the prop ie) -#define SIR_MAC_PROP_CAPABILITY_HCF WNI_CFG_PROP_CAPABILITY_HCF -#define SIR_MAC_PROP_CAPABILITY_11EQOS WNI_CFG_PROP_CAPABILITY_11EQOS -#define SIR_MAC_PROP_CAPABILITY_WME WNI_CFG_PROP_CAPABILITY_WME -#define SIR_MAC_PROP_CAPABILITY_WSM WNI_CFG_PROP_CAPABILITY_WSM -#define SIR_MAC_PROP_CAPABILITY_EXTRATES WNI_CFG_PROP_CAPABILITY_EXTRATES -// ap->sta only, request STA to stop using prop rates for some time -#define SIR_MAC_PROP_CAPABILITY_EXTRATE_STOP WNI_CFG_PROP_CAPABILITY_EXTRATE_STOP -#define SIR_MAC_PROP_CAPABILITY_TITAN WNI_CFG_PROP_CAPABILITY_TITAN -#define SIR_MAC_PROP_CAPABILITY_TAURUS WNI_CFG_PROP_CAPABILITY_TAURUS -#define SIR_MAC_PROP_CAPABILITY_ESCORT_PKT WNI_CFG_PROP_CAPABILITY_ESCORT_PKT -// unused 9-12 -#define SIR_MAC_PROP_CAPABILITY_EDCAPARAMS WNI_CFG_PROP_CAPABILITY_EDCAPARAMS -#define SIR_MAC_PROP_CAPABILITY_LOADINFO WNI_CFG_PROP_CAPABILITY_LOADINFO -#define SIR_MAC_PROP_CAPABILITY_VERSION WNI_CFG_PROP_CAPABILITY_VERSION -#define SIR_MAC_PROP_CAPABILITY_MAXBITOFFSET WNI_CFG_PROP_CAPABILITY_MAXBITOFFSET - #define PROP_CAPABILITY_GET(bitname, value) \ (((value) >> SIR_MAC_PROP_CAPABILITY_ ## bitname) & 1) #define IS_DOT11_MODE_PROPRIETARY(dot11Mode) \ - (((dot11Mode == WNI_CFG_DOT11_MODE_POLARIS) || \ - (dot11Mode == WNI_CFG_DOT11_MODE_TITAN) || \ - (dot11Mode == WNI_CFG_DOT11_MODE_TAURUS) || \ - (dot11Mode == WNI_CFG_DOT11_MODE_ALL)) ? TRUE: FALSE) + ((dot11Mode == WNI_CFG_DOT11_MODE_ALL) ? TRUE: FALSE) #define IS_DOT11_MODE_HT(dot11Mode) \ (((dot11Mode == WNI_CFG_DOT11_MODE_11N) || \ (dot11Mode == WNI_CFG_DOT11_MODE_11N_ONLY) || \ (dot11Mode == WNI_CFG_DOT11_MODE_11AC) || \ (dot11Mode == WNI_CFG_DOT11_MODE_11AC_ONLY) || \ - (dot11Mode == WNI_CFG_DOT11_MODE_TAURUS) || \ (dot11Mode == WNI_CFG_DOT11_MODE_ALL)) ? TRUE: FALSE) #ifdef WLAN_FEATURE_11AC #define IS_DOT11_MODE_VHT(dot11Mode) \ (((dot11Mode == WNI_CFG_DOT11_MODE_11AC) || \ (dot11Mode == WNI_CFG_DOT11_MODE_11AC_ONLY) || \ - (dot11Mode == WNI_CFG_DOT11_MODE_TAURUS) || \ (dot11Mode == WNI_CFG_DOT11_MODE_ALL)) ? TRUE: FALSE) #endif @@ -130,55 +98,6 @@ typedef struct sSirMacPropVersion /* Default value for gLimRestoreCBNumScanInterval */ #define LIM_RESTORE_CB_NUM_SCAN_INTERVAL_DEFAULT 2 -// -// Proprietary Quite BSS IE structure -// -// Based on the setting of the "Titan" proprietary bit -// in the tSirPropIEStruct.capability field (bit #6), -// this IE will be sent appropriately to all the ANI -// peers in the following management frames - -// 1) Beacons -// 2) Probe Rsp -// -typedef struct sQuietBssIEStruct -{ - - // Indicates the number of TBTT's until the next beacon - // interval during which the next quiet interval will - // start - // 1 - Quiet Interval will start during the beacon - // interval starting at the next TBTT - // 0 - Reserved - tANI_U8 quietCount; - - // Shall be set to the number of beacon intervals between - // the start of regularly scheduled quiet intervals - // defined by this Quiet Element - // 0 - No periodic quiet interval is defined - tANI_U8 quietPeriod; - - // Duration of the quiet interval, expressed in TUs - // 1 TU = 1024 microseconds?? - tANI_U16 quietDuration; - - // Set to the offset of the start of the quiet interval - // from the TBTT specified by the quietCount field, - // expressed in TUs. The value of this offset field will - // be less than one beacon interval - // 1 TU = 1024 microseconds?? - tANI_U16 quietOffset; - -} tQuietBssIEStruct, *tpQuietBssIEStruct; - -typedef struct sChannelSwitchPropIEStruct -{ - tANI_U8 mode; - tANI_U8 primaryChannel; - tANI_U8 subBand; - tANI_U8 channelSwitchCount; - -} tChannelSwitchPropIEStruct, *tpChannelSwitchPropIEStruct; - // generic proprietary IE structure definition typedef struct sSirPropIEStruct { @@ -190,12 +109,9 @@ typedef struct sSirPropIEStruct tANI_U8 versionPresent:1; tANI_U8 edcaParamPresent:1; tANI_U8 capabilityPresent:1; - tANI_U8 titanPresent:1; - tANI_U8 taurusPresent:1; tANI_U8 propChannelSwitchPresent:1; - tANI_U8 quietBssPresent:1; tANI_U8 triggerStaScanPresent:1; - tANI_U8 rsvd:5; + tANI_U8 rsvd:8; tSirMacPropRateSet propRates; @@ -204,8 +120,6 @@ typedef struct sSirPropIEStruct tANI_U16 capability; // capability bit map tSirMacPropVersion version; tSirMacEdcaParamSetIE edca; - tChannelSwitchPropIEStruct channelSwitch; - tQuietBssIEStruct quietBss; tANI_U8 triggerStaScanEnable; diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h index f0c9ad24d78b..24043f54ec5d 100644 --- a/CORE/MAC/inc/wniApi.h +++ b/CORE/MAC/inc/wniApi.h @@ -81,19 +81,6 @@ #define ANI_DUMMY_PKT_MSG_LEN 16 #define ANI_DUMMY_DATA_PAYLOAD_OFFSET 10 -/** - * Product IDs stored in the EEPROM for the different types of AP radio cards - * supported by Polaris - */ -#define AGN1323AR_00 4 -#define AGN1323AR_01 5 -#define AGN1223AR_00 6 -#define AGN1223AR_01 7 -#define AGN1223AR_02 8 -#define AGN_EEP_PRODUCT_ID_MAX 8 - - - /// Start of Sirius/Host message types #define WNI_HOST_MSG_START 0x1500 diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h index 819415026d95..e40adaaace6b 100644 --- a/CORE/MAC/inc/wniCfgAp.h +++ b/CORE/MAC/inc/wniCfgAp.h @@ -128,237 +128,226 @@ #define WNI_CFG_CURRENT_TX_ANTENNA 81 #define WNI_CFG_CURRENT_RX_ANTENNA 82 #define WNI_CFG_CURRENT_TX_POWER_LEVEL 83 -#define WNI_CFG_POWER_STATE_PER_CHAIN 84 -#define WNI_CFG_NEW_BSS_FOUND_IND 85 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED 86 -#define WNI_CFG_PROPRIETARY_RATES_ENABLED 87 -#define WNI_CFG_AP_NODE_NAME 88 -#define WNI_CFG_COUNTRY_CODE 89 -#define WNI_CFG_11H_ENABLED 90 -#define WNI_CFG_WT_CNF_TIMEOUT 91 -#define WNI_CFG_KEEPALIVE_TIMEOUT 92 -#define WNI_CFG_PROXIMITY 93 -#define WNI_CFG_LOG_LEVEL 94 -#define WNI_CFG_OLBC_DETECT_TIMEOUT 95 -#define WNI_CFG_PROTECTION_ENABLED 96 -#define WNI_CFG_11G_PROTECTION_ALWAYS 97 -#define WNI_CFG_FORCE_POLICY_PROTECTION 98 -#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED 99 -#define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED 100 -#define WNI_CFG_CAL_PERIOD 101 -#define WNI_CFG_STATS_PERIOD 102 -#define WNI_CFG_CAL_CONTROL 103 -#define WNI_CFG_11G_ONLY_POLICY 104 -#define WNI_CFG_PACKET_CLASSIFICATION 105 -#define WNI_CFG_WME_ENABLED 106 -#define WNI_CFG_ADDTS_RSP_TIMEOUT 107 -#define WNI_CFG_MAX_SP_LENGTH 108 -#define WNI_CFG_KEEP_ALIVE_STA_LIMIT_THRESHOLD 109 -#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS 110 -#define WNI_CFG_WSM_ENABLED 111 -#define WNI_CFG_PROP_CAPABILITY 112 -#define WNI_CFG_EDCA_PROFILE 113 -#define WNI_CFG_EDCA_ANI_ACBK_LOCAL 114 -#define WNI_CFG_EDCA_ANI_ACBE_LOCAL 115 -#define WNI_CFG_EDCA_ANI_ACVI_LOCAL 116 -#define WNI_CFG_EDCA_ANI_ACVO_LOCAL 117 -#define WNI_CFG_EDCA_ANI_ACBK 118 -#define WNI_CFG_EDCA_ANI_ACBE 119 -#define WNI_CFG_EDCA_ANI_ACVI 120 -#define WNI_CFG_EDCA_ANI_ACVO 121 -#define WNI_CFG_EDCA_WME_ACBK_LOCAL 122 -#define WNI_CFG_EDCA_WME_ACBE_LOCAL 123 -#define WNI_CFG_EDCA_WME_ACVI_LOCAL 124 -#define WNI_CFG_EDCA_WME_ACVO_LOCAL 125 -#define WNI_CFG_EDCA_WME_ACBK 126 -#define WNI_CFG_EDCA_WME_ACBE 127 -#define WNI_CFG_EDCA_WME_ACVI 128 -#define WNI_CFG_EDCA_WME_ACVO 129 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK_LOCAL 130 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE_LOCAL 131 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI_LOCAL 132 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO_LOCAL 133 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK 134 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE 135 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI 136 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO 137 -#define WNI_CFG_RDET_FLAG 138 -#define WNI_CFG_RADAR_CHANNEL_LIST 139 -#define WNI_CFG_LOCAL_POWER_CONSTRAINT 140 -#define WNI_CFG_ADMIT_POLICY 141 -#define WNI_CFG_ADMIT_BWFACTOR 142 -#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE 143 -#define WNI_CFG_CHANNEL_BONDING_MODE 144 -#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE 145 -#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO 146 -#define WNI_CFG_DYNAMIC_THRESHOLD_ONE 147 -#define WNI_CFG_DYNAMIC_THRESHOLD_TWO 148 -#define WNI_CFG_TRIG_STA_BK_SCAN 149 -#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING 150 -#define WNI_CFG_SCAN_CONTROL_LIST 151 -#define WNI_CFG_MIMO_ENABLED 152 -#define WNI_CFG_BLOCK_ACK_ENABLED 153 -#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT 154 -#define WNI_CFG_HT_RX_STBC 155 -#define WNI_CFG_HT_CAP_INFO 156 -#define WNI_CFG_HT_AMPDU_PARAMS 157 -#define WNI_CFG_SUPPORTED_MCS_SET 158 -#define WNI_CFG_EXT_HT_CAP_INFO 159 -#define WNI_CFG_TX_BF_CAP 160 -#define WNI_CFG_AS_CAP 161 -#define WNI_CFG_HT_INFO_FIELD1 162 -#define WNI_CFG_HT_INFO_FIELD2 163 -#define WNI_CFG_HT_INFO_FIELD3 164 -#define WNI_CFG_BASIC_MCS_SET 165 -#define WNI_CFG_CURRENT_MCS_SET 166 -#define WNI_CFG_GREENFIELD_CAPABILITY 167 -#define WNI_CFG_VHT_MAX_MPDU_LENGTH 168 -#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET 169 -#define WNI_CFG_VHT_LDPC_CODING_CAP 170 -#define WNI_CFG_VHT_SHORT_GI_80MHZ 171 -#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ 172 -#define WNI_CFG_VHT_TXSTBC 173 -#define WNI_CFG_VHT_RXSTBC 174 -#define WNI_CFG_VHT_SU_BEAMFORMER_CAP 175 -#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP 176 -#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED 177 -#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS 178 -#define WNI_CFG_VHT_MU_BEAMFORMER_CAP 179 -#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP 180 -#define WNI_CFG_VHT_TXOP_PS 181 -#define WNI_CFG_VHT_HTC_VHTC_CAP 182 -#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT 183 -#define WNI_CFG_VHT_LINK_ADAPTATION_CAP 184 -#define WNI_CFG_VHT_RX_ANT_PATTERN 185 -#define WNI_CFG_VHT_TX_ANT_PATTERN 186 -#define WNI_CFG_VHT_RX_MCS_MAP 187 -#define WNI_CFG_VHT_TX_MCS_MAP 188 -#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE 189 -#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE 190 -#define WNI_CFG_VHT_CHANNEL_WIDTH 191 -#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1 192 -#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2 193 -#define WNI_CFG_VHT_BASIC_MCS_SET 194 -#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT 195 -#define WNI_CFG_VHT_SS_UNDER_UTIL 196 -#define WNI_CFG_VHT_40MHZ_UTILIZATION 197 -#define WNI_CFG_VHT_80MHZ_UTILIZATION 198 -#define WNI_CFG_VHT_160MHZ_UTILIZATION 199 -#define WNI_CFG_MAX_AMSDU_LENGTH 200 -#define WNI_CFG_MPDU_DENSITY 201 -#define WNI_CFG_NUM_BUFF_ADVERT 202 -#define WNI_CFG_MAX_RX_AMPDU_FACTOR 203 -#define WNI_CFG_SHORT_GI_20MHZ 204 -#define WNI_CFG_SHORT_GI_40MHZ 205 -#define WNI_CFG_RIFS_ENABLED 206 -#define WNI_CFG_MAX_PS_POLL 207 -#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE 208 -#define WNI_CFG_RSSI_FILTER_PERIOD 209 -#define WNI_CFG_MIN_RSSI_THRESHOLD 210 -#define WNI_CFG_NTH_BEACON_FILTER 211 -#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 212 -#define WNI_CFG_SCAN_IN_POWERSAVE 213 -#define WNI_CFG_IGNORE_DTIM 214 -#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 215 -#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 216 -#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 217 -#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 218 -#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 219 -#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 220 -#define WNI_CFG_BA_TIMEOUT 221 -#define WNI_CFG_BA_THRESHOLD_HIGH 222 -#define WNI_CFG_MAX_BA_BUFFERS 223 -#define WNI_CFG_MAX_BA_SESSIONS 224 -#define WNI_CFG_BA_AUTO_SETUP 225 -#define WNI_CFG_ADDBA_REQ_DECLINE 226 -#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC 227 -#define WNI_CFG_BG_SCAN_CHANNEL_LIST 228 -#define WNI_CFG_MAX_MEDIUM_TIME 229 -#define WNI_CFG_MAX_MPDUS_IN_AMPDU 230 -#define WNI_CFG_IBSS_AUTO_BSSID 231 -#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 232 -#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 233 -#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 234 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 235 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 236 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 237 -#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 238 -#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 239 -#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 240 -#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 241 -#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 242 -#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 243 -#define WNI_CFG_WPS_ENABLE 244 -#define WNI_CFG_WPS_STATE 245 -#define WNI_CFG_WPS_PROBE_REQ_FLAG 246 -#define WNI_CFG_WPS_VERSION 247 -#define WNI_CFG_WPS_REQUEST_TYPE 248 -#define WNI_CFG_WPS_CFG_METHOD 249 -#define WNI_CFG_WPS_UUID 250 -#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 251 -#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 252 -#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 253 -#define WNI_CFG_WPS_ASSOCIATION_STATE 254 -#define WNI_CFG_WPS_CONFIGURATION_ERROR 255 -#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 256 -#define WNI_CFG_WPS_ASSOC_METHOD 257 -#define WNI_CFG_LOW_GAIN_OVERRIDE 258 -#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 259 -#define WNI_CFG_RPE_POLLING_THRESHOLD 260 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 261 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 262 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 263 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 264 -#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 265 -#define WNI_CFG_SINGLE_TID_RC 266 -#define WNI_CFG_RRM_ENABLED 267 -#define WNI_CFG_RRM_OPERATING_CHAN_MAX 268 -#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 269 -#define WNI_CFG_TX_PWR_CTRL_ENABLE 270 -#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 271 -#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 272 -#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 273 -#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 274 -#define WNI_CFG_TELE_BCN_WAKEUP_EN 275 -#define WNI_CFG_TELE_BCN_TRANS_LI 276 -#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 277 -#define WNI_CFG_TELE_BCN_MAX_LI 278 -#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 279 -#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 280 -#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 281 -#define WNI_CFG_ASSOC_STA_LIMIT 282 -#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 283 -#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 284 -#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 285 -#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 286 -#define WNI_CFG_ENABLE_CLOSE_LOOP 287 -#define WNI_CFG_ENABLE_LTE_COEX 288 -#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 289 -#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 290 -#define WNI_CFG_ENABLE_MC_ADDR_LIST 291 -#define WNI_CFG_ENABLE_UC_FILTER 292 -#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 293 -#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 294 -#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 295 -#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT 296 -#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK 297 -#define WNI_CFG_TDLS_BUF_STA_ENABLED 298 -#define WNI_CFG_TDLS_PUAPSD_INACT_TIME 299 -#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD 300 -#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES 301 -#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL 302 -#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN 303 -#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 304 -#define WNI_CFG_ANTENNA_DIVESITY 305 -#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 306 -#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY 307 -#define WNI_CFG_CURRENT_RSSI 308 -#define WNI_CFG_RTT3_ENABLE 309 -#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL 310 -#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED 311 -#define WNI_CFG_IBSS_ATIM_WIN_SIZE 312 -#define WNI_CFG_DFS_MASTER_ENABLED 313 -#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ 314 +#define WNI_CFG_NEW_BSS_FOUND_IND 84 +#define WNI_CFG_PROPRIETARY_RATES_ENABLED 85 +#define WNI_CFG_AP_NODE_NAME 86 +#define WNI_CFG_COUNTRY_CODE 87 +#define WNI_CFG_11H_ENABLED 88 +#define WNI_CFG_WT_CNF_TIMEOUT 89 +#define WNI_CFG_KEEPALIVE_TIMEOUT 90 +#define WNI_CFG_PROXIMITY 91 +#define WNI_CFG_LOG_LEVEL 92 +#define WNI_CFG_OLBC_DETECT_TIMEOUT 93 +#define WNI_CFG_PROTECTION_ENABLED 94 +#define WNI_CFG_11G_PROTECTION_ALWAYS 95 +#define WNI_CFG_FORCE_POLICY_PROTECTION 96 +#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED 97 +#define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED 98 +#define WNI_CFG_CAL_PERIOD 99 +#define WNI_CFG_STATS_PERIOD 100 +#define WNI_CFG_CAL_CONTROL 101 +#define WNI_CFG_11G_ONLY_POLICY 102 +#define WNI_CFG_PACKET_CLASSIFICATION 103 +#define WNI_CFG_WME_ENABLED 104 +#define WNI_CFG_ADDTS_RSP_TIMEOUT 105 +#define WNI_CFG_MAX_SP_LENGTH 106 +#define WNI_CFG_KEEP_ALIVE_STA_LIMIT_THRESHOLD 107 +#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS 108 +#define WNI_CFG_WSM_ENABLED 109 +#define WNI_CFG_EDCA_PROFILE 110 +#define WNI_CFG_EDCA_ANI_ACBK_LOCAL 111 +#define WNI_CFG_EDCA_ANI_ACBE_LOCAL 112 +#define WNI_CFG_EDCA_ANI_ACVI_LOCAL 113 +#define WNI_CFG_EDCA_ANI_ACVO_LOCAL 114 +#define WNI_CFG_EDCA_ANI_ACBK 115 +#define WNI_CFG_EDCA_ANI_ACBE 116 +#define WNI_CFG_EDCA_ANI_ACVI 117 +#define WNI_CFG_EDCA_ANI_ACVO 118 +#define WNI_CFG_EDCA_WME_ACBK_LOCAL 119 +#define WNI_CFG_EDCA_WME_ACBE_LOCAL 120 +#define WNI_CFG_EDCA_WME_ACVI_LOCAL 121 +#define WNI_CFG_EDCA_WME_ACVO_LOCAL 122 +#define WNI_CFG_EDCA_WME_ACBK 123 +#define WNI_CFG_EDCA_WME_ACBE 124 +#define WNI_CFG_EDCA_WME_ACVI 125 +#define WNI_CFG_EDCA_WME_ACVO 126 +#define WNI_CFG_RDET_FLAG 127 +#define WNI_CFG_RADAR_CHANNEL_LIST 128 +#define WNI_CFG_LOCAL_POWER_CONSTRAINT 129 +#define WNI_CFG_ADMIT_POLICY 130 +#define WNI_CFG_ADMIT_BWFACTOR 131 +#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE 132 +#define WNI_CFG_CHANNEL_BONDING_MODE 133 +#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE 134 +#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO 135 +#define WNI_CFG_DYNAMIC_THRESHOLD_ONE 136 +#define WNI_CFG_DYNAMIC_THRESHOLD_TWO 137 +#define WNI_CFG_TRIG_STA_BK_SCAN 138 +#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING 139 +#define WNI_CFG_SCAN_CONTROL_LIST 140 +#define WNI_CFG_MIMO_ENABLED 141 +#define WNI_CFG_BLOCK_ACK_ENABLED 142 +#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT 143 +#define WNI_CFG_HT_RX_STBC 144 +#define WNI_CFG_HT_CAP_INFO 145 +#define WNI_CFG_HT_AMPDU_PARAMS 146 +#define WNI_CFG_SUPPORTED_MCS_SET 147 +#define WNI_CFG_EXT_HT_CAP_INFO 148 +#define WNI_CFG_TX_BF_CAP 149 +#define WNI_CFG_AS_CAP 150 +#define WNI_CFG_HT_INFO_FIELD1 151 +#define WNI_CFG_HT_INFO_FIELD2 152 +#define WNI_CFG_HT_INFO_FIELD3 153 +#define WNI_CFG_BASIC_MCS_SET 154 +#define WNI_CFG_CURRENT_MCS_SET 155 +#define WNI_CFG_GREENFIELD_CAPABILITY 156 +#define WNI_CFG_VHT_MAX_MPDU_LENGTH 157 +#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET 158 +#define WNI_CFG_VHT_LDPC_CODING_CAP 159 +#define WNI_CFG_VHT_SHORT_GI_80MHZ 160 +#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ 161 +#define WNI_CFG_VHT_TXSTBC 162 +#define WNI_CFG_VHT_RXSTBC 163 +#define WNI_CFG_VHT_SU_BEAMFORMER_CAP 164 +#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP 165 +#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED 166 +#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS 167 +#define WNI_CFG_VHT_MU_BEAMFORMER_CAP 168 +#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP 169 +#define WNI_CFG_VHT_TXOP_PS 170 +#define WNI_CFG_VHT_HTC_VHTC_CAP 171 +#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT 172 +#define WNI_CFG_VHT_LINK_ADAPTATION_CAP 173 +#define WNI_CFG_VHT_RX_ANT_PATTERN 174 +#define WNI_CFG_VHT_TX_ANT_PATTERN 175 +#define WNI_CFG_VHT_RX_MCS_MAP 176 +#define WNI_CFG_VHT_TX_MCS_MAP 177 +#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE 178 +#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE 179 +#define WNI_CFG_VHT_CHANNEL_WIDTH 180 +#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1 181 +#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2 182 +#define WNI_CFG_VHT_BASIC_MCS_SET 183 +#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT 184 +#define WNI_CFG_VHT_SS_UNDER_UTIL 185 +#define WNI_CFG_VHT_40MHZ_UTILIZATION 186 +#define WNI_CFG_VHT_80MHZ_UTILIZATION 187 +#define WNI_CFG_VHT_160MHZ_UTILIZATION 188 +#define WNI_CFG_MAX_AMSDU_LENGTH 189 +#define WNI_CFG_MPDU_DENSITY 190 +#define WNI_CFG_NUM_BUFF_ADVERT 191 +#define WNI_CFG_MAX_RX_AMPDU_FACTOR 192 +#define WNI_CFG_SHORT_GI_20MHZ 193 +#define WNI_CFG_SHORT_GI_40MHZ 194 +#define WNI_CFG_RIFS_ENABLED 195 +#define WNI_CFG_MAX_PS_POLL 196 +#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE 197 +#define WNI_CFG_RSSI_FILTER_PERIOD 198 +#define WNI_CFG_MIN_RSSI_THRESHOLD 199 +#define WNI_CFG_NTH_BEACON_FILTER 200 +#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 201 +#define WNI_CFG_SCAN_IN_POWERSAVE 202 +#define WNI_CFG_IGNORE_DTIM 203 +#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 204 +#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 205 +#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 206 +#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 207 +#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 208 +#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 209 +#define WNI_CFG_BA_TIMEOUT 210 +#define WNI_CFG_BA_THRESHOLD_HIGH 211 +#define WNI_CFG_MAX_BA_BUFFERS 212 +#define WNI_CFG_MAX_BA_SESSIONS 213 +#define WNI_CFG_BA_AUTO_SETUP 214 +#define WNI_CFG_ADDBA_REQ_DECLINE 215 +#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC 216 +#define WNI_CFG_BG_SCAN_CHANNEL_LIST 217 +#define WNI_CFG_MAX_MEDIUM_TIME 218 +#define WNI_CFG_MAX_MPDUS_IN_AMPDU 219 +#define WNI_CFG_IBSS_AUTO_BSSID 220 +#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 221 +#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 222 +#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 223 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 224 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 225 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 226 +#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 227 +#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 228 +#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 229 +#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 230 +#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 231 +#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 232 +#define WNI_CFG_WPS_ENABLE 233 +#define WNI_CFG_WPS_STATE 234 +#define WNI_CFG_WPS_PROBE_REQ_FLAG 235 +#define WNI_CFG_WPS_VERSION 236 +#define WNI_CFG_WPS_REQUEST_TYPE 237 +#define WNI_CFG_WPS_CFG_METHOD 238 +#define WNI_CFG_WPS_UUID 239 +#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 240 +#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 241 +#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 242 +#define WNI_CFG_WPS_ASSOCIATION_STATE 243 +#define WNI_CFG_WPS_CONFIGURATION_ERROR 244 +#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 245 +#define WNI_CFG_WPS_ASSOC_METHOD 246 +#define WNI_CFG_LOW_GAIN_OVERRIDE 247 +#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 248 +#define WNI_CFG_RPE_POLLING_THRESHOLD 249 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 250 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 251 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 252 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 253 +#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 254 +#define WNI_CFG_SINGLE_TID_RC 255 +#define WNI_CFG_RRM_ENABLED 256 +#define WNI_CFG_RRM_OPERATING_CHAN_MAX 257 +#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 258 +#define WNI_CFG_TX_PWR_CTRL_ENABLE 259 +#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 260 +#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 261 +#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 262 +#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 263 +#define WNI_CFG_TELE_BCN_WAKEUP_EN 264 +#define WNI_CFG_TELE_BCN_TRANS_LI 265 +#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 266 +#define WNI_CFG_TELE_BCN_MAX_LI 267 +#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 268 +#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 269 +#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 270 +#define WNI_CFG_ASSOC_STA_LIMIT 271 +#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 272 +#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 273 +#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 274 +#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 275 +#define WNI_CFG_ENABLE_CLOSE_LOOP 276 +#define WNI_CFG_ENABLE_LTE_COEX 277 +#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 278 +#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 279 +#define WNI_CFG_ENABLE_MC_ADDR_LIST 280 +#define WNI_CFG_ENABLE_UC_FILTER 281 +#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 282 +#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 283 +#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 284 +#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT 285 +#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK 286 +#define WNI_CFG_TDLS_BUF_STA_ENABLED 287 +#define WNI_CFG_TDLS_PUAPSD_INACT_TIME 288 +#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD 289 +#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES 290 +#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL 291 +#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN 292 +#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 293 +#define WNI_CFG_ANTENNA_DIVESITY 294 +#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 295 +#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY 296 +#define WNI_CFG_CURRENT_RSSI 297 +#define WNI_CFG_RTT3_ENABLE 298 +#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL 299 +#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED 300 +#define WNI_CFG_IBSS_ATIM_WIN_SIZE 301 +#define WNI_CFG_DFS_MASTER_ENABLED 302 +#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ 303 /* * String parameter lengths @@ -402,14 +391,6 @@ #define WNI_CFG_EDCA_WME_ACBE_LEN 20 #define WNI_CFG_EDCA_WME_ACVI_LEN 20 #define WNI_CFG_EDCA_WME_ACVO_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK_LOCAL_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE_LOCAL_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI_LOCAL_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO_LOCAL_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO_LEN 20 #define WNI_CFG_RADAR_CHANNEL_LIST_LEN 20 #define WNI_CFG_SCAN_CONTROL_LIST_LEN 128 #define WNI_CFG_SUPPORTED_MCS_SET_LEN 16 @@ -651,13 +632,10 @@ #define WNI_CFG_DOT11_MODE_11B 2 #define WNI_CFG_DOT11_MODE_11G 3 #define WNI_CFG_DOT11_MODE_11N 4 -#define WNI_CFG_DOT11_MODE_POLARIS 5 -#define WNI_CFG_DOT11_MODE_TITAN 6 -#define WNI_CFG_DOT11_MODE_TAURUS 7 -#define WNI_CFG_DOT11_MODE_11G_ONLY 8 -#define WNI_CFG_DOT11_MODE_11N_ONLY 9 -#define WNI_CFG_DOT11_MODE_11AC 10 -#define WNI_CFG_DOT11_MODE_11AC_ONLY 11 +#define WNI_CFG_DOT11_MODE_11G_ONLY 5 +#define WNI_CFG_DOT11_MODE_11N_ONLY 6 +#define WNI_CFG_DOT11_MODE_11AC 7 +#define WNI_CFG_DOT11_MODE_11AC_ONLY 8 #define WNI_CFG_LISTEN_INTERVAL_STAMIN 0 #define WNI_CFG_LISTEN_INTERVAL_STAMAX 65535 @@ -988,23 +966,6 @@ #define WNI_CFG_CURRENT_TX_POWER_LEVEL_APMAX 128 #define WNI_CFG_CURRENT_TX_POWER_LEVEL_APDEF 27 -#define WNI_CFG_POWER_STATE_PER_CHAIN_STAMIN 0 -#define WNI_CFG_POWER_STATE_PER_CHAIN_STAMAX 65535 -#define WNI_CFG_POWER_STATE_PER_CHAIN_STADEF 785 - -#define WNI_CFG_POWER_STATE_PER_CHAIN_APMIN 0 -#define WNI_CFG_POWER_STATE_PER_CHAIN_APMAX 65535 -#define WNI_CFG_POWER_STATE_PER_CHAIN_APDEF 785 - -#define WNI_CFG_POWER_STATE_PER_CHAIN_OFF 0 -#define WNI_CFG_POWER_STATE_PER_CHAIN_ON 1 -#define WNI_CFG_POWER_STATE_PER_CHAIN_TX 2 -#define WNI_CFG_POWER_STATE_PER_CHAIN_RX 3 -#define WNI_CFG_POWER_STATE_PER_CHAIN_MASK 15 -#define WNI_CFG_POWER_STATE_PER_CHAIN_CHAIN_0_OFFSET 0 -#define WNI_CFG_POWER_STATE_PER_CHAIN_CHAIN_1_OFFSET 4 -#define WNI_CFG_POWER_STATE_PER_CHAIN_CHAIN_2_OFFSET 8 - #define WNI_CFG_NEW_BSS_FOUND_IND_STAMIN 0 #define WNI_CFG_NEW_BSS_FOUND_IND_STAMAX 1 #define WNI_CFG_NEW_BSS_FOUND_IND_STADEF 0 @@ -1013,14 +974,6 @@ #define WNI_CFG_NEW_BSS_FOUND_IND_APMAX 1 #define WNI_CFG_NEW_BSS_FOUND_IND_APDEF 0 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED_STAMIN 0 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED_STAMAX 1 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED_STADEF 0 - -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED_APMIN 0 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED_APMAX 1 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED_APDEF 0 - #define WNI_CFG_PROPRIETARY_RATES_ENABLED_STAMIN 0 #define WNI_CFG_PROPRIETARY_RATES_ENABLED_STAMAX 1 #define WNI_CFG_PROPRIETARY_RATES_ENABLED_STADEF 0 @@ -1236,27 +1189,6 @@ #define WNI_CFG_WSM_ENABLED_APMAX 1 #define WNI_CFG_WSM_ENABLED_APDEF 0 -#define WNI_CFG_PROP_CAPABILITY_STAMIN 0 -#define WNI_CFG_PROP_CAPABILITY_STAMAX 65535 -#define WNI_CFG_PROP_CAPABILITY_STADEF 57535 - -#define WNI_CFG_PROP_CAPABILITY_APMIN 0 -#define WNI_CFG_PROP_CAPABILITY_APMAX 65535 -#define WNI_CFG_PROP_CAPABILITY_APDEF 49321 - -#define WNI_CFG_PROP_CAPABILITY_HCF 0 -#define WNI_CFG_PROP_CAPABILITY_11EQOS 1 -#define WNI_CFG_PROP_CAPABILITY_WME 2 -#define WNI_CFG_PROP_CAPABILITY_WSM 3 -#define WNI_CFG_PROP_CAPABILITY_EXTRATES 4 -#define WNI_CFG_PROP_CAPABILITY_EXTRATE_STOP 5 -#define WNI_CFG_PROP_CAPABILITY_TITAN 6 -#define WNI_CFG_PROP_CAPABILITY_TAURUS 7 -#define WNI_CFG_PROP_CAPABILITY_EDCAPARAMS 13 -#define WNI_CFG_PROP_CAPABILITY_LOADINFO 14 -#define WNI_CFG_PROP_CAPABILITY_VERSION 15 -#define WNI_CFG_PROP_CAPABILITY_MAXBITOFFSET 15 - #define WNI_CFG_EDCA_PROFILE_STAMIN 0 #define WNI_CFG_EDCA_PROFILE_STAMAX 255 #define WNI_CFG_EDCA_PROFILE_STADEF 1 @@ -2637,11 +2569,11 @@ #define WNI_CFG_VHT_ENABLE_TXBF_20MHZ_APMAX 1 #define WNI_CFG_VHT_ENABLE_TXBF_20MHZ_APDEF 0 -#define CFG_PARAM_MAX_NUM 315 -#define CFG_AP_IBUF_MAX_SIZE 255 -#define CFG_AP_SBUF_MAX_SIZE 3414 -#define CFG_STA_IBUF_MAX_SIZE 250 -#define CFG_STA_SBUF_MAX_SIZE 3380 +#define CFG_PARAM_MAX_NUM 304 +#define CFG_AP_IBUF_MAX_SIZE 252 +#define CFG_AP_SBUF_MAX_SIZE 3238 +#define CFG_STA_IBUF_MAX_SIZE 247 +#define CFG_STA_SBUF_MAX_SIZE 3204 #define CFG_SEM_MAX_NUM 19 #define CFG_STA_MAGIC_DWORD 0xbeefbeef diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h index 9ba03e42b9e5..88bd6d96923c 100644 --- a/CORE/MAC/inc/wniCfgSta.h +++ b/CORE/MAC/inc/wniCfgSta.h @@ -124,235 +124,224 @@ #define WNI_CFG_CURRENT_TX_ANTENNA 81 #define WNI_CFG_CURRENT_RX_ANTENNA 82 #define WNI_CFG_CURRENT_TX_POWER_LEVEL 83 -#define WNI_CFG_POWER_STATE_PER_CHAIN 84 -#define WNI_CFG_NEW_BSS_FOUND_IND 85 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED 86 -#define WNI_CFG_PROPRIETARY_RATES_ENABLED 87 -#define WNI_CFG_COUNTRY_CODE 89 -#define WNI_CFG_11H_ENABLED 90 -#define WNI_CFG_WT_CNF_TIMEOUT 91 -#define WNI_CFG_KEEPALIVE_TIMEOUT 92 -#define WNI_CFG_PROXIMITY 93 -#define WNI_CFG_LOG_LEVEL 94 -#define WNI_CFG_OLBC_DETECT_TIMEOUT 95 -#define WNI_CFG_PROTECTION_ENABLED 96 -#define WNI_CFG_11G_PROTECTION_ALWAYS 97 -#define WNI_CFG_FORCE_POLICY_PROTECTION 98 -#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED 99 -#define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED 100 -#define WNI_CFG_CAL_PERIOD 101 -#define WNI_CFG_STATS_PERIOD 102 -#define WNI_CFG_CAL_CONTROL 103 -#define WNI_CFG_11G_ONLY_POLICY 104 -#define WNI_CFG_PACKET_CLASSIFICATION 105 -#define WNI_CFG_WME_ENABLED 106 -#define WNI_CFG_ADDTS_RSP_TIMEOUT 107 -#define WNI_CFG_MAX_SP_LENGTH 108 -#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS 110 -#define WNI_CFG_WSM_ENABLED 111 -#define WNI_CFG_PROP_CAPABILITY 112 -#define WNI_CFG_EDCA_PROFILE 113 -#define WNI_CFG_EDCA_ANI_ACBK_LOCAL 114 -#define WNI_CFG_EDCA_ANI_ACBE_LOCAL 115 -#define WNI_CFG_EDCA_ANI_ACVI_LOCAL 116 -#define WNI_CFG_EDCA_ANI_ACVO_LOCAL 117 -#define WNI_CFG_EDCA_ANI_ACBK 118 -#define WNI_CFG_EDCA_ANI_ACBE 119 -#define WNI_CFG_EDCA_ANI_ACVI 120 -#define WNI_CFG_EDCA_ANI_ACVO 121 -#define WNI_CFG_EDCA_WME_ACBK_LOCAL 122 -#define WNI_CFG_EDCA_WME_ACBE_LOCAL 123 -#define WNI_CFG_EDCA_WME_ACVI_LOCAL 124 -#define WNI_CFG_EDCA_WME_ACVO_LOCAL 125 -#define WNI_CFG_EDCA_WME_ACBK 126 -#define WNI_CFG_EDCA_WME_ACBE 127 -#define WNI_CFG_EDCA_WME_ACVI 128 -#define WNI_CFG_EDCA_WME_ACVO 129 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK_LOCAL 130 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE_LOCAL 131 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI_LOCAL 132 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO_LOCAL 133 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK 134 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE 135 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI 136 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO 137 -#define WNI_CFG_RDET_FLAG 138 -#define WNI_CFG_RADAR_CHANNEL_LIST 139 -#define WNI_CFG_LOCAL_POWER_CONSTRAINT 140 -#define WNI_CFG_ADMIT_POLICY 141 -#define WNI_CFG_ADMIT_BWFACTOR 142 -#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE 143 -#define WNI_CFG_CHANNEL_BONDING_MODE 144 -#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE 145 -#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO 146 -#define WNI_CFG_DYNAMIC_THRESHOLD_ONE 147 -#define WNI_CFG_DYNAMIC_THRESHOLD_TWO 148 -#define WNI_CFG_TRIG_STA_BK_SCAN 149 -#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING 150 -#define WNI_CFG_SCAN_CONTROL_LIST 151 -#define WNI_CFG_MIMO_ENABLED 152 -#define WNI_CFG_BLOCK_ACK_ENABLED 153 -#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT 154 -#define WNI_CFG_HT_RX_STBC 155 -#define WNI_CFG_HT_CAP_INFO 156 -#define WNI_CFG_HT_AMPDU_PARAMS 157 -#define WNI_CFG_SUPPORTED_MCS_SET 158 -#define WNI_CFG_EXT_HT_CAP_INFO 159 -#define WNI_CFG_TX_BF_CAP 160 -#define WNI_CFG_AS_CAP 161 -#define WNI_CFG_HT_INFO_FIELD1 162 -#define WNI_CFG_HT_INFO_FIELD2 163 -#define WNI_CFG_HT_INFO_FIELD3 164 -#define WNI_CFG_BASIC_MCS_SET 165 -#define WNI_CFG_CURRENT_MCS_SET 166 -#define WNI_CFG_GREENFIELD_CAPABILITY 167 -#define WNI_CFG_VHT_MAX_MPDU_LENGTH 168 -#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET 169 -#define WNI_CFG_VHT_LDPC_CODING_CAP 170 -#define WNI_CFG_VHT_SHORT_GI_80MHZ 171 -#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ 172 -#define WNI_CFG_VHT_TXSTBC 173 -#define WNI_CFG_VHT_RXSTBC 174 -#define WNI_CFG_VHT_SU_BEAMFORMER_CAP 175 -#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP 176 -#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED 177 -#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS 178 -#define WNI_CFG_VHT_MU_BEAMFORMER_CAP 179 -#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP 180 -#define WNI_CFG_VHT_TXOP_PS 181 -#define WNI_CFG_VHT_HTC_VHTC_CAP 182 -#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT 183 -#define WNI_CFG_VHT_LINK_ADAPTATION_CAP 184 -#define WNI_CFG_VHT_RX_ANT_PATTERN 185 -#define WNI_CFG_VHT_TX_ANT_PATTERN 186 -#define WNI_CFG_VHT_RX_MCS_MAP 187 -#define WNI_CFG_VHT_TX_MCS_MAP 188 -#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE 189 -#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE 190 -#define WNI_CFG_VHT_CHANNEL_WIDTH 191 -#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1 192 -#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2 193 -#define WNI_CFG_VHT_BASIC_MCS_SET 194 -#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT 195 -#define WNI_CFG_VHT_SS_UNDER_UTIL 196 -#define WNI_CFG_VHT_40MHZ_UTILIZATION 197 -#define WNI_CFG_VHT_80MHZ_UTILIZATION 198 -#define WNI_CFG_VHT_160MHZ_UTILIZATION 199 -#define WNI_CFG_MAX_AMSDU_LENGTH 200 -#define WNI_CFG_MPDU_DENSITY 201 -#define WNI_CFG_NUM_BUFF_ADVERT 202 -#define WNI_CFG_MAX_RX_AMPDU_FACTOR 203 -#define WNI_CFG_SHORT_GI_20MHZ 204 -#define WNI_CFG_SHORT_GI_40MHZ 205 -#define WNI_CFG_RIFS_ENABLED 206 -#define WNI_CFG_MAX_PS_POLL 207 -#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE 208 -#define WNI_CFG_RSSI_FILTER_PERIOD 209 -#define WNI_CFG_MIN_RSSI_THRESHOLD 210 -#define WNI_CFG_NTH_BEACON_FILTER 211 -#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 212 -#define WNI_CFG_SCAN_IN_POWERSAVE 213 -#define WNI_CFG_IGNORE_DTIM 214 -#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 215 -#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 216 -#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 217 -#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 218 -#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 219 -#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 220 -#define WNI_CFG_BA_TIMEOUT 221 -#define WNI_CFG_BA_THRESHOLD_HIGH 222 -#define WNI_CFG_MAX_BA_BUFFERS 223 -#define WNI_CFG_MAX_BA_SESSIONS 224 -#define WNI_CFG_BA_AUTO_SETUP 225 -#define WNI_CFG_ADDBA_REQ_DECLINE 226 -#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC 227 -#define WNI_CFG_BG_SCAN_CHANNEL_LIST 228 -#define WNI_CFG_MAX_MEDIUM_TIME 229 -#define WNI_CFG_MAX_MPDUS_IN_AMPDU 230 -#define WNI_CFG_IBSS_AUTO_BSSID 231 -#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 232 -#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 233 -#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 234 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 235 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 236 -#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 237 -#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 238 -#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 239 -#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 240 -#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 241 -#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 242 -#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 243 -#define WNI_CFG_WPS_ENABLE 244 -#define WNI_CFG_WPS_STATE 245 -#define WNI_CFG_WPS_PROBE_REQ_FLAG 246 -#define WNI_CFG_WPS_VERSION 247 -#define WNI_CFG_WPS_REQUEST_TYPE 248 -#define WNI_CFG_WPS_CFG_METHOD 249 -#define WNI_CFG_WPS_UUID 250 -#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 251 -#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 252 -#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 253 -#define WNI_CFG_WPS_ASSOCIATION_STATE 254 -#define WNI_CFG_WPS_CONFIGURATION_ERROR 255 -#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 256 -#define WNI_CFG_WPS_ASSOC_METHOD 257 -#define WNI_CFG_LOW_GAIN_OVERRIDE 258 -#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 259 -#define WNI_CFG_RPE_POLLING_THRESHOLD 260 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 261 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 262 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 263 -#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 264 -#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 265 -#define WNI_CFG_SINGLE_TID_RC 266 -#define WNI_CFG_RRM_ENABLED 267 -#define WNI_CFG_RRM_OPERATING_CHAN_MAX 268 -#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 269 -#define WNI_CFG_TX_PWR_CTRL_ENABLE 270 -#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 271 -#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 272 -#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 273 -#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 274 -#define WNI_CFG_TELE_BCN_WAKEUP_EN 275 -#define WNI_CFG_TELE_BCN_TRANS_LI 276 -#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 277 -#define WNI_CFG_TELE_BCN_MAX_LI 278 -#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 279 -#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 280 -#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 281 -#define WNI_CFG_ASSOC_STA_LIMIT 282 -#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 283 -#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 284 -#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 285 -#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 286 -#define WNI_CFG_ENABLE_CLOSE_LOOP 287 -#define WNI_CFG_ENABLE_LTE_COEX 288 -#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 289 -#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 290 -#define WNI_CFG_ENABLE_MC_ADDR_LIST 291 -#define WNI_CFG_ENABLE_UC_FILTER 292 -#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 293 -#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 294 -#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 295 -#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT 296 -#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK 297 -#define WNI_CFG_TDLS_BUF_STA_ENABLED 298 -#define WNI_CFG_TDLS_PUAPSD_INACT_TIME 299 -#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD 300 -#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES 301 -#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL 302 -#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN 303 -#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 304 -#define WNI_CFG_ANTENNA_DIVESITY 305 -#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 306 -#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY 307 -#define WNI_CFG_CURRENT_RSSI 308 -#define WNI_CFG_RTT3_ENABLE 309 -#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL 310 -#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED 311 -#define WNI_CFG_IBSS_ATIM_WIN_SIZE 312 -#define WNI_CFG_DFS_MASTER_ENABLED 313 -#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ 314 +#define WNI_CFG_NEW_BSS_FOUND_IND 84 +#define WNI_CFG_PROPRIETARY_RATES_ENABLED 85 +#define WNI_CFG_COUNTRY_CODE 87 +#define WNI_CFG_11H_ENABLED 88 +#define WNI_CFG_WT_CNF_TIMEOUT 89 +#define WNI_CFG_KEEPALIVE_TIMEOUT 90 +#define WNI_CFG_PROXIMITY 91 +#define WNI_CFG_LOG_LEVEL 92 +#define WNI_CFG_OLBC_DETECT_TIMEOUT 93 +#define WNI_CFG_PROTECTION_ENABLED 94 +#define WNI_CFG_11G_PROTECTION_ALWAYS 95 +#define WNI_CFG_FORCE_POLICY_PROTECTION 96 +#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED 97 +#define WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED 98 +#define WNI_CFG_CAL_PERIOD 99 +#define WNI_CFG_STATS_PERIOD 100 +#define WNI_CFG_CAL_CONTROL 101 +#define WNI_CFG_11G_ONLY_POLICY 102 +#define WNI_CFG_PACKET_CLASSIFICATION 103 +#define WNI_CFG_WME_ENABLED 104 +#define WNI_CFG_ADDTS_RSP_TIMEOUT 105 +#define WNI_CFG_MAX_SP_LENGTH 106 +#define WNI_CFG_SEND_SINGLE_SSID_ALWAYS 108 +#define WNI_CFG_WSM_ENABLED 109 +#define WNI_CFG_EDCA_PROFILE 110 +#define WNI_CFG_EDCA_ANI_ACBK_LOCAL 111 +#define WNI_CFG_EDCA_ANI_ACBE_LOCAL 112 +#define WNI_CFG_EDCA_ANI_ACVI_LOCAL 113 +#define WNI_CFG_EDCA_ANI_ACVO_LOCAL 114 +#define WNI_CFG_EDCA_ANI_ACBK 115 +#define WNI_CFG_EDCA_ANI_ACBE 116 +#define WNI_CFG_EDCA_ANI_ACVI 117 +#define WNI_CFG_EDCA_ANI_ACVO 118 +#define WNI_CFG_EDCA_WME_ACBK_LOCAL 119 +#define WNI_CFG_EDCA_WME_ACBE_LOCAL 120 +#define WNI_CFG_EDCA_WME_ACVI_LOCAL 121 +#define WNI_CFG_EDCA_WME_ACVO_LOCAL 122 +#define WNI_CFG_EDCA_WME_ACBK 123 +#define WNI_CFG_EDCA_WME_ACBE 124 +#define WNI_CFG_EDCA_WME_ACVI 125 +#define WNI_CFG_EDCA_WME_ACVO 126 +#define WNI_CFG_RDET_FLAG 127 +#define WNI_CFG_RADAR_CHANNEL_LIST 128 +#define WNI_CFG_LOCAL_POWER_CONSTRAINT 129 +#define WNI_CFG_ADMIT_POLICY 130 +#define WNI_CFG_ADMIT_BWFACTOR 131 +#define WNI_CFG_MAX_CONSECUTIVE_BACKGROUND_SCAN_FAILURE 132 +#define WNI_CFG_CHANNEL_BONDING_MODE 133 +#define WNI_CFG_CB_SECONDARY_CHANNEL_STATE 134 +#define WNI_CFG_DYNAMIC_THRESHOLD_ZERO 135 +#define WNI_CFG_DYNAMIC_THRESHOLD_ONE 136 +#define WNI_CFG_DYNAMIC_THRESHOLD_TWO 137 +#define WNI_CFG_TRIG_STA_BK_SCAN 138 +#define WNI_CFG_DYNAMIC_PROFILE_SWITCHING 139 +#define WNI_CFG_SCAN_CONTROL_LIST 140 +#define WNI_CFG_MIMO_ENABLED 141 +#define WNI_CFG_BLOCK_ACK_ENABLED 142 +#define WNI_CFG_BA_ACTIVITY_CHECK_TIMEOUT 143 +#define WNI_CFG_HT_RX_STBC 144 +#define WNI_CFG_HT_CAP_INFO 145 +#define WNI_CFG_HT_AMPDU_PARAMS 146 +#define WNI_CFG_SUPPORTED_MCS_SET 147 +#define WNI_CFG_EXT_HT_CAP_INFO 148 +#define WNI_CFG_TX_BF_CAP 149 +#define WNI_CFG_AS_CAP 150 +#define WNI_CFG_HT_INFO_FIELD1 151 +#define WNI_CFG_HT_INFO_FIELD2 152 +#define WNI_CFG_HT_INFO_FIELD3 153 +#define WNI_CFG_BASIC_MCS_SET 154 +#define WNI_CFG_CURRENT_MCS_SET 155 +#define WNI_CFG_GREENFIELD_CAPABILITY 156 +#define WNI_CFG_VHT_MAX_MPDU_LENGTH 157 +#define WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET 158 +#define WNI_CFG_VHT_LDPC_CODING_CAP 159 +#define WNI_CFG_VHT_SHORT_GI_80MHZ 160 +#define WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ 161 +#define WNI_CFG_VHT_TXSTBC 162 +#define WNI_CFG_VHT_RXSTBC 163 +#define WNI_CFG_VHT_SU_BEAMFORMER_CAP 164 +#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP 165 +#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED 166 +#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS 167 +#define WNI_CFG_VHT_MU_BEAMFORMER_CAP 168 +#define WNI_CFG_VHT_MU_BEAMFORMEE_CAP 169 +#define WNI_CFG_VHT_TXOP_PS 170 +#define WNI_CFG_VHT_HTC_VHTC_CAP 171 +#define WNI_CFG_VHT_AMPDU_LEN_EXPONENT 172 +#define WNI_CFG_VHT_LINK_ADAPTATION_CAP 173 +#define WNI_CFG_VHT_RX_ANT_PATTERN 174 +#define WNI_CFG_VHT_TX_ANT_PATTERN 175 +#define WNI_CFG_VHT_RX_MCS_MAP 176 +#define WNI_CFG_VHT_TX_MCS_MAP 177 +#define WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE 178 +#define WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE 179 +#define WNI_CFG_VHT_CHANNEL_WIDTH 180 +#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT1 181 +#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2 182 +#define WNI_CFG_VHT_BASIC_MCS_SET 183 +#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT 184 +#define WNI_CFG_VHT_SS_UNDER_UTIL 185 +#define WNI_CFG_VHT_40MHZ_UTILIZATION 186 +#define WNI_CFG_VHT_80MHZ_UTILIZATION 187 +#define WNI_CFG_VHT_160MHZ_UTILIZATION 188 +#define WNI_CFG_MAX_AMSDU_LENGTH 189 +#define WNI_CFG_MPDU_DENSITY 190 +#define WNI_CFG_NUM_BUFF_ADVERT 191 +#define WNI_CFG_MAX_RX_AMPDU_FACTOR 192 +#define WNI_CFG_SHORT_GI_20MHZ 193 +#define WNI_CFG_SHORT_GI_40MHZ 194 +#define WNI_CFG_RIFS_ENABLED 195 +#define WNI_CFG_MAX_PS_POLL 196 +#define WNI_CFG_NUM_BEACON_PER_RSSI_AVERAGE 197 +#define WNI_CFG_RSSI_FILTER_PERIOD 198 +#define WNI_CFG_MIN_RSSI_THRESHOLD 199 +#define WNI_CFG_NTH_BEACON_FILTER 200 +#define WNI_CFG_BROADCAST_FRAME_FILTER_ENABLE 201 +#define WNI_CFG_SCAN_IN_POWERSAVE 202 +#define WNI_CFG_IGNORE_DTIM 203 +#define WNI_CFG_WOWLAN_UCAST_PATTERN_FILTER_ENABLE 204 +#define WNI_CFG_WOWLAN_CHANNEL_SWITCH_ENABLE 205 +#define WNI_CFG_WOWLAN_DEAUTH_ENABLE 206 +#define WNI_CFG_WOWLAN_DISASSOC_ENABLE 207 +#define WNI_CFG_WOWLAN_MAX_MISSED_BEACON 208 +#define WNI_CFG_WOWLAN_MAX_SLEEP_PERIOD 209 +#define WNI_CFG_BA_TIMEOUT 210 +#define WNI_CFG_BA_THRESHOLD_HIGH 211 +#define WNI_CFG_MAX_BA_BUFFERS 212 +#define WNI_CFG_MAX_BA_SESSIONS 213 +#define WNI_CFG_BA_AUTO_SETUP 214 +#define WNI_CFG_ADDBA_REQ_DECLINE 215 +#define WNI_CFG_DEL_ALL_RX_BA_SESSIONS_2_4_G_BTC 216 +#define WNI_CFG_BG_SCAN_CHANNEL_LIST 217 +#define WNI_CFG_MAX_MEDIUM_TIME 218 +#define WNI_CFG_MAX_MPDUS_IN_AMPDU 219 +#define WNI_CFG_IBSS_AUTO_BSSID 220 +#define WNI_CFG_PROBE_REQ_ADDNIE_FLAG 221 +#define WNI_CFG_PROBE_REQ_ADDNIE_DATA 222 +#define WNI_CFG_PROBE_RSP_ADDNIE_FLAG 223 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA1 224 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA2 225 +#define WNI_CFG_PROBE_RSP_ADDNIE_DATA3 226 +#define WNI_CFG_ASSOC_RSP_ADDNIE_FLAG 227 +#define WNI_CFG_ASSOC_RSP_ADDNIE_DATA 228 +#define WNI_CFG_PROBE_REQ_ADDNP2PIE_FLAG 229 +#define WNI_CFG_PROBE_REQ_ADDNP2PIE_DATA 230 +#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG 231 +#define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA 232 +#define WNI_CFG_WPS_ENABLE 233 +#define WNI_CFG_WPS_STATE 234 +#define WNI_CFG_WPS_PROBE_REQ_FLAG 235 +#define WNI_CFG_WPS_VERSION 236 +#define WNI_CFG_WPS_REQUEST_TYPE 237 +#define WNI_CFG_WPS_CFG_METHOD 238 +#define WNI_CFG_WPS_UUID 239 +#define WNI_CFG_WPS_PRIMARY_DEVICE_CATEGORY 240 +#define WNI_CFG_WPS_PIMARY_DEVICE_OUI 241 +#define WNI_CFG_WPS_DEVICE_SUB_CATEGORY 242 +#define WNI_CFG_WPS_ASSOCIATION_STATE 243 +#define WNI_CFG_WPS_CONFIGURATION_ERROR 244 +#define WNI_CFG_WPS_DEVICE_PASSWORD_ID 245 +#define WNI_CFG_WPS_ASSOC_METHOD 246 +#define WNI_CFG_LOW_GAIN_OVERRIDE 247 +#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE 248 +#define WNI_CFG_RPE_POLLING_THRESHOLD 249 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC0_REG 250 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC1_REG 251 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC2_REG 252 +#define WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG 253 +#define WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS 254 +#define WNI_CFG_SINGLE_TID_RC 255 +#define WNI_CFG_RRM_ENABLED 256 +#define WNI_CFG_RRM_OPERATING_CHAN_MAX 257 +#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX 258 +#define WNI_CFG_TX_PWR_CTRL_ENABLE 259 +#define WNI_CFG_MCAST_BCAST_FILTER_SETTING 260 +#define WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK 261 +#define WNI_CFG_DYNAMIC_PS_POLL_VALUE 262 +#define WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT 263 +#define WNI_CFG_TELE_BCN_WAKEUP_EN 264 +#define WNI_CFG_TELE_BCN_TRANS_LI 265 +#define WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS 266 +#define WNI_CFG_TELE_BCN_MAX_LI 267 +#define WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS 268 +#define WNI_CFG_BTC_A2DP_DHCP_BT_SUB_INTERVALS 269 +#define WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD 270 +#define WNI_CFG_ASSOC_STA_LIMIT 271 +#define WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL 272 +#define WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL 273 +#define WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND 274 +#define WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD 275 +#define WNI_CFG_ENABLE_CLOSE_LOOP 276 +#define WNI_CFG_ENABLE_LTE_COEX 277 +#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 278 +#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 279 +#define WNI_CFG_ENABLE_MC_ADDR_LIST 280 +#define WNI_CFG_ENABLE_UC_FILTER 281 +#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 282 +#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 283 +#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 284 +#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT 285 +#define WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK 286 +#define WNI_CFG_TDLS_BUF_STA_ENABLED 287 +#define WNI_CFG_TDLS_PUAPSD_INACT_TIME 288 +#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD 289 +#define WNI_CFG_PMF_SA_QUERY_MAX_RETRIES 290 +#define WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL 291 +#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN 292 +#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 293 +#define WNI_CFG_ANTENNA_DIVESITY 294 +#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 295 +#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY 296 +#define WNI_CFG_CURRENT_RSSI 297 +#define WNI_CFG_RTT3_ENABLE 298 +#define WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL 299 +#define WNI_CFG_TDLS_OFF_CHANNEL_ENABLED 300 +#define WNI_CFG_IBSS_ATIM_WIN_SIZE 301 +#define WNI_CFG_DFS_MASTER_ENABLED 302 +#define WNI_CFG_VHT_ENABLE_TXBF_20MHZ 303 /* * String parameter lengths @@ -395,14 +384,6 @@ #define WNI_CFG_EDCA_WME_ACBE_LEN 20 #define WNI_CFG_EDCA_WME_ACVI_LEN 20 #define WNI_CFG_EDCA_WME_ACVO_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK_LOCAL_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE_LOCAL_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI_LOCAL_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO_LOCAL_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACBK_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACBE_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACVI_LEN 20 -#define WNI_CFG_EDCA_TIT_DEMO_ACVO_LEN 20 #define WNI_CFG_RADAR_CHANNEL_LIST_LEN 20 #define WNI_CFG_SCAN_CONTROL_LIST_LEN 128 #define WNI_CFG_SUPPORTED_MCS_SET_LEN 16 @@ -552,13 +533,10 @@ #define WNI_CFG_DOT11_MODE_11B 2 #define WNI_CFG_DOT11_MODE_11G 3 #define WNI_CFG_DOT11_MODE_11N 4 -#define WNI_CFG_DOT11_MODE_POLARIS 5 -#define WNI_CFG_DOT11_MODE_TITAN 6 -#define WNI_CFG_DOT11_MODE_TAURUS 7 -#define WNI_CFG_DOT11_MODE_11G_ONLY 8 -#define WNI_CFG_DOT11_MODE_11N_ONLY 9 -#define WNI_CFG_DOT11_MODE_11AC 10 -#define WNI_CFG_DOT11_MODE_11AC_ONLY 11 +#define WNI_CFG_DOT11_MODE_11G_ONLY 5 +#define WNI_CFG_DOT11_MODE_11N_ONLY 6 +#define WNI_CFG_DOT11_MODE_11AC 7 +#define WNI_CFG_DOT11_MODE_11AC_ONLY 8 #define WNI_CFG_LISTEN_INTERVAL_STAMIN 0 #define WNI_CFG_LISTEN_INTERVAL_STAMAX 65535 @@ -753,27 +731,10 @@ #define WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMAX 128 #define WNI_CFG_CURRENT_TX_POWER_LEVEL_STADEF 27 -#define WNI_CFG_POWER_STATE_PER_CHAIN_STAMIN 0 -#define WNI_CFG_POWER_STATE_PER_CHAIN_STAMAX 65535 -#define WNI_CFG_POWER_STATE_PER_CHAIN_STADEF 785 - -#define WNI_CFG_POWER_STATE_PER_CHAIN_OFF 0 -#define WNI_CFG_POWER_STATE_PER_CHAIN_ON 1 -#define WNI_CFG_POWER_STATE_PER_CHAIN_TX 2 -#define WNI_CFG_POWER_STATE_PER_CHAIN_RX 3 -#define WNI_CFG_POWER_STATE_PER_CHAIN_MASK 15 -#define WNI_CFG_POWER_STATE_PER_CHAIN_CHAIN_0_OFFSET 0 -#define WNI_CFG_POWER_STATE_PER_CHAIN_CHAIN_1_OFFSET 4 -#define WNI_CFG_POWER_STATE_PER_CHAIN_CHAIN_2_OFFSET 8 - #define WNI_CFG_NEW_BSS_FOUND_IND_STAMIN 0 #define WNI_CFG_NEW_BSS_FOUND_IND_STAMAX 1 #define WNI_CFG_NEW_BSS_FOUND_IND_STADEF 0 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED_STAMIN 0 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED_STAMAX 1 -#define WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED_STADEF 0 - #define WNI_CFG_PROPRIETARY_RATES_ENABLED_STAMIN 0 #define WNI_CFG_PROPRIETARY_RATES_ENABLED_STAMAX 1 #define WNI_CFG_PROPRIETARY_RATES_ENABLED_STADEF 0 @@ -897,23 +858,6 @@ #define WNI_CFG_WSM_ENABLED_STAMAX 1 #define WNI_CFG_WSM_ENABLED_STADEF 0 -#define WNI_CFG_PROP_CAPABILITY_STAMIN 0 -#define WNI_CFG_PROP_CAPABILITY_STAMAX 65535 -#define WNI_CFG_PROP_CAPABILITY_STADEF 57535 - -#define WNI_CFG_PROP_CAPABILITY_HCF 0 -#define WNI_CFG_PROP_CAPABILITY_11EQOS 1 -#define WNI_CFG_PROP_CAPABILITY_WME 2 -#define WNI_CFG_PROP_CAPABILITY_WSM 3 -#define WNI_CFG_PROP_CAPABILITY_EXTRATES 4 -#define WNI_CFG_PROP_CAPABILITY_EXTRATE_STOP 5 -#define WNI_CFG_PROP_CAPABILITY_TITAN 6 -#define WNI_CFG_PROP_CAPABILITY_TAURUS 7 -#define WNI_CFG_PROP_CAPABILITY_EDCAPARAMS 13 -#define WNI_CFG_PROP_CAPABILITY_LOADINFO 14 -#define WNI_CFG_PROP_CAPABILITY_VERSION 15 -#define WNI_CFG_PROP_CAPABILITY_MAXBITOFFSET 15 - #define WNI_CFG_EDCA_PROFILE_STAMIN 0 #define WNI_CFG_EDCA_PROFILE_STAMAX 255 #define WNI_CFG_EDCA_PROFILE_STADEF 1 @@ -1698,9 +1642,9 @@ #define WNI_CFG_VHT_ENABLE_TXBF_20MHZ_STAMAX 1 #define WNI_CFG_VHT_ENABLE_TXBF_20MHZ_STADEF 0 -#define CFG_PARAM_MAX_NUM 315 -#define CFG_STA_IBUF_MAX_SIZE 250 -#define CFG_STA_SBUF_MAX_SIZE 3380 +#define CFG_PARAM_MAX_NUM 304 +#define CFG_STA_IBUF_MAX_SIZE 247 +#define CFG_STA_SBUF_MAX_SIZE 3204 #define CFG_SEM_MAX_NUM 19 #define CFG_STA_MAGIC_DWORD 0xbeefbeef diff --git a/CORE/MAC/src/cfg/cfgParamName.c b/CORE/MAC/src/cfg/cfgParamName.c index d9038bdc09cb..205ad84f9e06 100644 --- a/CORE/MAC/src/cfg/cfgParamName.c +++ b/CORE/MAC/src/cfg/cfgParamName.c @@ -20,6 +20,12 @@ */ /* + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. + */ + +/* * DO NOT EDIT - This file is generated automatically */ @@ -113,9 +119,7 @@ unsigned char *gCfgParamName[] = { (unsigned char *)"CURRENT_TX_ANTENNA", (unsigned char *)"CURRENT_RX_ANTENNA", (unsigned char *)"CURRENT_TX_POWER_LEVEL", - (unsigned char *)"POWER_STATE_PER_CHAIN", (unsigned char *)"NEW_BSS_FOUND_IND", - (unsigned char *)"PROPRIETARY_ANI_FEATURES_ENABLED", (unsigned char *)"PROPRIETARY_RATES_ENABLED", (unsigned char *)"AP_NODE_NAME", (unsigned char *)"COUNTRY_CODE", @@ -141,7 +145,6 @@ unsigned char *gCfgParamName[] = { (unsigned char *)"KEEP_ALIVE_STA_LIMIT_THRESHOLD", (unsigned char *)"SEND_SINGLE_SSID_ALWAYS", (unsigned char *)"WSM_ENABLED", - (unsigned char *)"PROP_CAPABILITY", (unsigned char *)"EDCA_PROFILE", (unsigned char *)"EDCA_ANI_ACBK_LOCAL", (unsigned char *)"EDCA_ANI_ACBE_LOCAL", @@ -159,14 +162,6 @@ unsigned char *gCfgParamName[] = { (unsigned char *)"EDCA_WME_ACBE", (unsigned char *)"EDCA_WME_ACVI", (unsigned char *)"EDCA_WME_ACVO", - (unsigned char *)"EDCA_TIT_DEMO_ACBK_LOCAL", - (unsigned char *)"EDCA_TIT_DEMO_ACBE_LOCAL", - (unsigned char *)"EDCA_TIT_DEMO_ACVI_LOCAL", - (unsigned char *)"EDCA_TIT_DEMO_ACVO_LOCAL", - (unsigned char *)"EDCA_TIT_DEMO_ACBK", - (unsigned char *)"EDCA_TIT_DEMO_ACBE", - (unsigned char *)"EDCA_TIT_DEMO_ACVI", - (unsigned char *)"EDCA_TIT_DEMO_ACVO", (unsigned char *)"RDET_FLAG", (unsigned char *)"RADAR_CHANNEL_LIST", (unsigned char *)"LOCAL_POWER_CONSTRAINT", @@ -345,3 +340,4 @@ unsigned char *gCfgParamName[] = { (unsigned char *)"DFS_MASTER_ENABLED", (unsigned char *)"VHT_ENABLE_TXBF_20MHZ", }; + diff --git a/CORE/MAC/src/cfg/cfgPriv.h b/CORE/MAC/src/cfg/cfgPriv.h index bec65f83ed85..2e12a167d71c 100644 --- a/CORE/MAC/src/cfg/cfgPriv.h +++ b/CORE/MAC/src/cfg/cfgPriv.h @@ -75,17 +75,6 @@ typedef struct sCfgBinHdr } tCfgBinHdr, *tpCfgBinHdr; -/*--------------------------------------------------------------------*/ -/* Polaris HW counter access structure */ -/*--------------------------------------------------------------------*/ -typedef struct -{ - tANI_U32 addr; - tANI_U32 mask; - tANI_U32 shift; -} tCfgHwCnt; - - #define CFG_STAT_CNT_LO_MASK 0x0000ffff #define CFG_STAT_CNT_HI_MASK 0xffff0000 #define CFG_STAT_CNT_HI_INCR 0x00010000 diff --git a/CORE/MAC/src/cfg/cfgUtil/cfg.txt b/CORE/MAC/src/cfg/cfgUtil/cfg.txt index 3caa6a0ca6fc..9f3f59e7a25f 100644 --- a/CORE/MAC/src/cfg/cfgUtil/cfg.txt +++ b/CORE/MAC/src/cfg/cfgUtil/cfg.txt @@ -617,13 +617,10 @@ LIM #ENUM 11B 2 #ENUM 11G 3 #ENUM 11N 4 -#ENUM POLARIS 5 -#ENUM TITAN 6 -#ENUM TAURUS 7 -#ENUM 11G_ONLY 8 -#ENUM 11N_ONLY 9 -#ENUM 11AC 10 -#ENUM 11AC_ONLY 11 +#ENUM 11G_ONLY 5 +#ENUM 11N_ONLY 6 +#ENUM 11AC 7 +#ENUM 11AC_ONLY 8 @@ -1306,50 +1303,6 @@ NONE * -* Radio Power State for each Chain -* -* This CFG is invoked when user issues the Apple setPower() -* command, which configures the power state for each chain. Currently, -* Taurus supports up to three chains, and each chain can be configured -* to one of the 4 following possible power states: -* POWER_OFF = 0x0 -* POWER_ON = 0x1 -* POWER_TX = 0x2 -* POWER_RX = 0x3 -* -* The power state of each chain is expressed in nibble: -* bit[0:3] - chain 0 -* bit[4:7] - chain 1 -* bit[8:11] - chain 2 -* bit[12:15] - not used at the moment -* -* Examples: -* 0x001 - 1x1 (chain 1 is for both tx and rcv. chain 1,2 are turned off) -* 0x031 - 1x2 (chain 0 is for both tx and rcv. chain 1 is rcv only. chain 2 is turned off) -* 0x011 - 2x2 (chain 0,1 are used for both tx and rcv) -* 0x311 - 2x3 (chain 0,1 are used for both tx and rcv. chain 2 is for rcv only) -* 0x333 - all 3 chains are set to RX -* - -WNI_CFG_POWER_STATE_PER_CHAIN I 4 9 -V RW NP -HAL -0 0xffff 0x311 -V RW NP -HAL -0 0xffff 0x311 - -#ENUM OFF 0 -#ENUM ON 1 -#ENUM TX 2 -#ENUM RX 3 -#ENUM MASK 0xf -#ENUM CHAIN_0_OFFSET 0 -#ENUM CHAIN_1_OFFSET 4 -#ENUM CHAIN_2_OFFSET 8 - - -* * Parameter to indicate or not new BSS found * @@ -1361,18 +1314,6 @@ V RW NP NONE 0 1 0 -* -* Proprietary ANI features enable/disable -* - -WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED I 4 12 -V RW NP RESTART -NONE -0 1 0 -V RW NP RESTART -NONE -0 1 0 - * * Qualcomm Prop Rates are disabled by default @@ -1757,37 +1698,6 @@ NONE * **************************************** * -* Proprietary IE capability enable -* bit mapped: -* 0:HCF 1:11eQos 2:WME 3:WSM 4:EXT_RATES -* 5:EXTRATE_STOP -* 6:Titan device 7:Taurus Device -* 13:EDCA 14:LOADINFO 15:VERSION -* - -WNI_CFG_PROP_CAPABILITY I 4 8 -V RW NP -NONE -0 0xffff 0xe0bf -V RW NP -NONE -0 0xffff 0xc0a9 - -#ENUM HCF 0 -#ENUM 11EQOS 1 -#ENUM WME 2 -#ENUM WSM 3 -#ENUM EXTRATES 4 -#ENUM EXTRATE_STOP 5 -#ENUM TITAN 6 -#ENUM TAURUS 7 -#ENUM EDCAPARAMS 13 -#ENUM LOADINFO 14 -#ENUM VERSION 15 -#ENUM MAXBITOFFSET 15 - -* **************************************** -* * Background Channel List * Contains pairs of {channelNumber, scanType} * where scanType = 0 indicates active scan and @@ -2053,110 +1963,6 @@ V RW NP RESTART NONE 17 0 2 0 3 0 7 47 0 3 0 7 102 0 3 0 7 47 -* **************************************** -* Profile 2(Titan Demo) parameters - AC_BK Local -* ACM, AIFSN, [CWminH, CWminL, CWmaxH, CWmaxL, TxOp]-11A/11B/11G -* - -WNI_CFG_EDCA_TIT_DEMO_ACBK_LOCAL S 20 8 -V RW NP RESTART -NONE -17 0 7 0 8 0 255 200 0 31 0 255 200 0 8 0 255 200 -V RW NP RESTART -NONE -17 0 7 0 8 0 255 200 0 31 0 255 200 0 8 0 255 200 - -* -* Profile 2(Titan Demo) parameters AC_BE Local -* ACM, AIFSN, [CWmin, CWmax, TxOp]-11A/11B/11G -* - -WNI_CFG_EDCA_TIT_DEMO_ACBE_LOCAL S 20 8 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 31 0 255 200 0 8 0 255 200 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 31 0 255 200 0 8 0 255 200 - -* -* Profile 2(Titan Demo) parameters AC_VI Local -* ACM, AIFSN, [CWmin, CWmax, TxOp]-11A/11B/11G -* - -WNI_CFG_EDCA_TIT_DEMO_ACVI_LOCAL S 20 8 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 - -* -* Profile 2(Titan Demo) parameters AC_VO Local -* ACM, AIFSN, [CWmin, CWmax, TxOp]-11A/11B/11G -* - -WNI_CFG_EDCA_TIT_DEMO_ACVO_LOCAL S 20 8 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 - -* -* Profile 2(Titan Demo) parameters - AC_BK Broadcast -* ACM, AIFSN, [CWmin, CWmax, TxOp]-11A/11B/11G -* - -WNI_CFG_EDCA_TIT_DEMO_ACBK S 20 8 -V RW NP RESTART -NONE -17 0 7 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 -V RW NP RESTART -NONE -17 0 7 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 - -* -* Profile 2(Titan Demo) parameters AC_BE Broadcast -* ACM, AIFSN, [CWmin, CWmax, TxOp]-11A/11B/11G -* - -WNI_CFG_EDCA_TIT_DEMO_ACBE S 20 8 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 - -* -* Profile 2(Titan Demo) parameters AC_VI Broadcast -* ACM, AIFSN, [CWmin, CWmax, TxOp]-11A/11B/11G -* - -WNI_CFG_EDCA_TIT_DEMO_ACVI S 20 8 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 - -* -* Profile 2(Titan Demo) parameters AC_VO Broadcast -* ACM, AIFSN, [CWmin, CWmax, TxOp]-11A/11B/11G -* - -WNI_CFG_EDCA_TIT_DEMO_ACVO S 20 8 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 -V RW NP RESTART -NONE -17 0 2 0 8 0 255 200 0 8 0 255 200 0 8 0 255 200 - * * Radar detector flag enable/disable * diff --git a/CORE/MAC/src/cfg/cfgUtil/dot11f.frms b/CORE/MAC/src/cfg/cfgUtil/dot11f.frms index 3d534b1477c4..9364fcc57fc1 100644 --- a/CORE/MAC/src/cfg/cfgUtil/dot11f.frms +++ b/CORE/MAC/src/cfg/cfgUtil/dot11f.frms @@ -132,11 +132,9 @@ const SIR_MAC_PROP_LL_ATTR_TYPE = 9; const SIR_MAC_PROP_CAPABILITY = 10; const SIR_MAC_PROP_VERSION = 11; const SIR_MAC_PROP_EDCAPARAMS = 12; -const SIR_MAC_PROP_TITAN = 14; const SIR_MAC_PROP_CHANNEL_SWITCH = 15; const SIR_MAC_PROP_QUIET_BSS = 16; const SIR_MAC_PROP_TRIG_STA_BK_SCAN = 17; -const SIR_MAC_PROP_TAURUS = 18; const ANI_WDS_INFO_MAX_LENGTH = 64; const SIR_MAC_MAX_NUMBER_OF_RATES = 12; @@ -2305,296 +2303,6 @@ IE PUBufferStatus (EID_PU_BUFFER_STATUS) // 7.3.2.66 } -///////////////////////////////////////////////////////////////////////////// -// Airgo Information Elements - - -IE Airgo (EID_VENDOR_SPECIFIC) OUI (0x00, 0x0A, 0xF5) -{ - // N.B. The fact that these IEs are defined inside the Airgo IE indicates - // that they can *only* occur inside the Airgo IE. - - OPTIE IE PropSuppRates (SIR_MAC_PROP_EXT_RATES_TYPE) - { - rates[1..12]; - } - - OPTIE IE APName (SIR_MAC_PROP_AP_NAME_TYPE) - { - name[1..32]; - } - - OPTIE IE HCF (SIR_MAC_PROP_HCF_TYPE) - { - enabled, 1; - } - - OPTIE IE WDS (SIR_MAC_PROP_WDS_TYPE) - { - wdsData[0..ANI_WDS_INFO_MAX_LENGTH]; - } - - OPTIE IE BPIndicator (SIR_MAC_PROP_BP_IND_TYPE) - { - indicator, 1; - type, 1; - } - - - // In Progress: I think SIR_MAC_PROP_NEIGHBOR_BSS_TYPE is going to need a - // custom parser... - - - OPTIE IE LoadInfo (SIR_MAC_PROP_LOAD_INFO_TYPE) MSB - { - num_stas, 2; - channel_util, 2; - } - - OPTIE IE LoadBalance (SIR_MAC_PROP_LOAD_BALANCE_TYPE) - { - bssid[6]; - channel, 1; - } - - OPTIE IE PropAssocType (SIR_MAC_PROP_ASSOC_TYPE) - { - type, 1; - } - - OPTIE IE LLAttr (SIR_MAC_PROP_LL_ATTR_TYPE) MSB - { - defer_threshold, 4; - } - - OPTIE IE PropCapability (SIR_MAC_PROP_CAPABILITY) - { - capability, 2; - } - - OPTIE IE Version (SIR_MAC_PROP_VERSION) - { - chip_rev, 4; - card_type, 1; - build_version[0..20]; - } - - OPTIE IE PropEDCAParams (SIR_MAC_PROP_EDCAPARAMS) - { - qos, 1; // ToDo: This is a bitfield whose format - // depends on whether this is from an AP - // or a STA, information which I'm not - // sure we have at parse time... - reserved, 1; - - // Best Effort - { - acbe_aifsn: 4; - acbe_acm: 1; - acbe_aci: 2; - unused1: 1; - } - { - acbe_min: 4; - acbe_max: 4; - } - acbe_txoplimit, 2; - - // Background - { - acbk_aifsn: 4; - acbk_acm: 1; - acbk_aci: 2; - unused2: 1; - } - { - acbk_min: 4; - acbk_max: 4; - } - acbk_txoplimit, 2; - - // Video - { - acvi_aifsn: 4; - acvi_acm: 1; - acvi_aci: 2; - unused3: 1; - } - { - acvi_min: 4; - acvi_max: 4; - } - acvi_txoplimit, 2; - - // Voice - { - acvo_aifsn: 4; - acvo_acm: 1; - acvo_aci: 2; - unused4: 1; - } - { - acvo_min: 4; - acvo_max: 4; - } - acvo_txoplimit, 2; - - } // End IE PropEDCAParams. - - /** - * \ie Titan - * - * \brief Proprietary Next Generation (TITAN) IE structure - * - * - * Based on the setting of the "Titan" proprietary bit in the - * tSirPropIEStruct.capability field (bit #6), this IE will be sent - * appropriately to all the ANIpeers in the following management frames - - * - * - Beacons - * - Assoc Req/Rsp - * - Reassoc Req/Rsp - * - Probe Req/Rsp - * - */ - - OPTIE IE Titan (SIR_MAC_PROP_TITAN) - { - concat_tcid_bitmap, 1; - compression_tcid_bitmap, 1; - - // Identifies the OPERATIONAL state of Channel Bonding - // This info is encoded as a bitmap as follows: - // - // b7 b6 b5 b4 b3 b2 b1 b0 - // -------------------------------------- - // |CCA_CB |CCA |ICE | AU|CS|U/D| O | A | - // -------------------------------------- - // where, - // A - Admin state of CB - [enabled(1)/disabled(0)] - // O - Oper state of CB - [on(1)/off(0)] - // U/D - Indicates where the secondary CB channel is - // parked - Up(1)/Down(0) from the primary - // CS - Channel Switch announcement in progress with - // respect to the secondary CB channel - // CS_on(1)/CS_off(0) - // This applies to an AP only - // AU - Autonomous updates. This indicates to an STA - // that it can send an unsolicited CB Report - // regarding its neighbor BSS during an Assoc/ - // ReAssoc REQ. - // AU_on(1)/AU_off(0) - // This applies to an AP only - // ICE - Intelligent Channel Expansion mode enable/disable - // ICE_on(1)/ICE_off(0) - // CCA - CCA mode to be used - // CCA_20MHz(0)/CCA_40MHz(1) - // CCA_CB - channel bonding enable/disable based on cca monitoring - // enable(1)/disable(0) - - cb_state, 1; - - // Identifies Reverse FCS pattern and state - // This info is encoded as a bitmap as follows: - // - // b7 b6 b5 b4 b3 b2 b1 b0 - // --------------------------------- - // | X | X | X | X | P | P | P | O | - // --------------------------------- - // where, - // O - Oper state of Reverse FCS - [on(1)/off(0)] - // P - Identifies the pattern ID to be used - // NOTE - These bits are used only during Assoc Req/Rsp - // management frames. Thus, the pattern ID needs to be - // looked up only during Assoc Req/Rsp. In other words, - // the pattern ID between an AP/STA is negotiated via - // the revFcsState during Assoc Req/Rsp - - rev_fcs_state, 1; - } - - OPTIE IE PropChannSwitchAnn (SIR_MAC_PROP_CHANNEL_SWITCH) - { - mode, 1; - primary_channel, 1; - sub_band, 1; - channel_switch_count, 1; - } - - /** - * \ie PropQuietBSS - * - * \brief Proprietary Quite BSS IE structure - * - * - * Based on the setting of the "Titan" proprietary bit in the - * tSirPropIEStruct.capability field (bit #6), this IE will be sent - * appropriately to all the ANI peers in the following management - * frames - * - * - Beacons - * - Probe Rsp - * - */ - - OPTIE IE PropQuietBSS (SIR_MAC_PROP_QUIET_BSS) - { - // Indicates the number of TBTT's until the next beacon - // interval during which the next quiet interval will - // start - // 1 - Quiet Interval will start during the beacon - // interval starting at the next TBTT - // 0 - Reserved - quiet_count, 1; - - // Shall be set to the number of beacon intervals between - // the start of regularly scheduled quiet intervals - // defined by this Quiet Element - // 0 - No periodic quiet interval is defined - quiet_period, 1; - - // Duration of the quiet interval, expressed in TUs - // 1 TU = 1024 microseconds?? - quiet_duration, 2; - - // Set to the offset of the start of the quiet interval - // from the TBTT specified by the quietCount field, - // expressed in TUs. The value of this offset field will - // be less than one beacon interval - // 1 TU = 1024 microseconds?? - quiet_offset, 2; - - } - - OPTIE IE TriggerStaBgScan (SIR_MAC_PROP_TRIG_STA_BK_SCAN) - { - enable, 1; - } - - OPTIE IE Taurus (SIR_MAC_PROP_TAURUS) - { - // TID bitmap indicating the TIDs for which BA is setup. - // bit0 for TID0, bit1 for TID1 and so on. - baTIDBitmap, 2; - - // Block Ack Policy: 0-Delayed BA 1-Immediate BA. - // One bit for each TID - baPolicy, 2; - - // Buffer size for each AC, in exponential notation. - // 3 bits reserved for each AC. - // bit0-2 for AC0[TID 0 and 3], bit3-5 for AC1[TID 1 and 2] - // and so on. - - // TID 8 & 11 will use AC0, TID 9 & 10 will use AC1, so use of AC is - // overloaded. This is done to reduce the size of IE in the beacons. - { - baBufferSize: 12; - rsvd: 4; - } - } - -} // End IE Airgo. IE VHTCaps (EID_VHT_CAPABILITIES) { @@ -3381,7 +3089,6 @@ FRAME Beacon // C.f. Sec. 7.2.3.1 OPTIE ESETrafStrmMet; OPTIE ESETxmitPower; - OPTIE Airgo; OPTIE WscBeacon; OPTIE P2PBeacon; OPTIE VHTCaps; @@ -3414,9 +3121,9 @@ FRAME Beacon // C.f. Sec. 7.2.3.1 // Next, it serializes the following fields into gSchBeaconFrameEnd: Country, // EDCAParamSet, PowerConstraints, TPCReport, ChannelSwitchAnn, Quiet, -// ERPInfo, HTCaps, HTInfo, ExtSuppRates, Airgo (via -// sirFillPropIEsInBeaconPR), WPA, RSN, WMMInfo, WMMParams, WMMCaps. The -// length of *this* buffer is kept in gSchBeaconOffsetEnd. +// ERPInfo, HTCaps, HTInfo, ExtSuppRates, WPA, RSN, WMMInfo, +// WMMParams, WMMCaps. +// The length of *this* buffer is kept in gSchBeaconOffsetEnd. // Then, in 'schBeaconInterruptHandler', we write CFParams & TIM at the end // of gSchBeaconFrameBegin, keeping track of the (new) size of this buffer in @@ -3461,7 +3168,6 @@ FRAME Beacon2 OPTIE WMMInfoAp; OPTIE WMMParams; OPTIE WMMCaps; - OPTIE Airgo; OPTIE WscBeacon; OPTIE WAPI; OPTIE ESERadMgmtCap; @@ -3525,7 +3231,6 @@ FRAME BeaconIEs OPTIE ESETrafStrmMet; OPTIE ESETxmitPower; - OPTIE Airgo; OPTIE WscBeaconProbeRes; OPTIE P2PBeaconProbeRes; OPTIE VHTCaps; @@ -3565,7 +3270,6 @@ FRAME AssocRequest // 7.2.3.4 OPTIE HTCaps; OPTIE WMMCaps; OPTIE WMMInfoStation; - OPTIE Airgo; OPTIE WscIEOpaque; OPTIE WAPIOpaque; OPTIE WAPI; @@ -3603,7 +3307,6 @@ FRAME AssocResponse // 7.2.3.5 OPTIE ESETrafStrmMet; OPTIE ESETxmitPower; OPTIE WMMTSPEC[0..4]; - OPTIE Airgo; OPTIE WscAssocRes; OPTIE P2PAssocRes; OPTIE VHTCaps; @@ -3633,7 +3336,6 @@ FRAME ReAssocRequest // 7.2.3.6 OPTIE HTCaps; OPTIE WMMCaps; OPTIE WMMInfoStation; - OPTIE Airgo; OPTIE WscIEOpaque; OPTIE WAPIOpaque; OPTIE WAPI; @@ -3675,7 +3377,6 @@ FRAME ReAssocResponse // 7.2.3.7 OPTIE ESETxmitPower; OPTIE WMMTSPEC[0..4]; OPTIE ESETrafStrmRateSet; - OPTIE Airgo; OPTIE WscReassocRes; OPTIE P2PAssocRes; OPTIE VHTCaps; @@ -3737,7 +3438,6 @@ FRAME ProbeResponse // 7.2.3.9 OPTIE ESETrafStrmMet; OPTIE ESETxmitPower; - OPTIE Airgo; OPTIE WscProbeRes; OPTIE P2PProbeRes; diff --git a/CORE/MAC/src/include/dot11f.h b/CORE/MAC/src/include/dot11f.h index a4c29b4dd43d..dd88fdb222d3 100644 --- a/CORE/MAC/src/include/dot11f.h +++ b/CORE/MAC/src/include/dot11f.h @@ -38,7 +38,7 @@ * * * This file was automatically generated by 'framesc' - * Mon Sep 15 19:24:53 2014 from the following file(s): + * Wed Sep 24 14:27:36 2014 from the following file(s): * * dot11f.frms * @@ -1725,58 +1725,6 @@ tANI_U32 dot11fGetPackedTlvP2PManageability(tpAniSirGlobal, tDot11fTLVP2PManagea * Information Elements * ********************************************************************/ -// EID 1 (0x01) -typedef struct sDot11fIEAPName { - tANI_U8 present; - tANI_U8 num_name; - tANI_U8 name[32]; -} tDot11fIEAPName; - -#define DOT11F_EID_APNAME ( 1 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_APNAME_MIN_LEN ( 1 ) - -#define DOT11F_IE_APNAME_MAX_LEN ( 32 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeAPName(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEAPName*); - -tANI_U32 dot11fPackIeAPName(tpAniSirGlobal, tDot11fIEAPName*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEAPName(tpAniSirGlobal, tDot11fIEAPName*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 4 (0x04) -typedef struct sDot11fIEBPIndicator { - tANI_U8 present; - tANI_U8 indicator; - tANI_U8 type; -} tDot11fIEBPIndicator; - -#define DOT11F_EID_BPINDICATOR ( 4 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_BPINDICATOR_MIN_LEN ( 2 ) - -#define DOT11F_IE_BPINDICATOR_MAX_LEN ( 2 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeBPIndicator(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEBPIndicator*); - -tANI_U32 dot11fPackIeBPIndicator(tpAniSirGlobal, tDot11fIEBPIndicator*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEBPIndicator(tpAniSirGlobal, tDot11fIEBPIndicator*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ // EID 2 (0x02) typedef struct sDot11fIECondensedCountryStr { tANI_U8 present; @@ -1832,31 +1780,6 @@ tANI_U32 dot11fGetPackedIEGTK(tpAniSirGlobal, tDot11fIEGTK*, tANI_U32*); #ifdef __cplusplus }; /* End extern "C". */ #endif /* C++ */ -// EID 2 (0x02) -typedef struct sDot11fIEHCF { - tANI_U8 present; - tANI_U8 enabled; -} tDot11fIEHCF; - -#define DOT11F_EID_HCF ( 2 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_HCF_MIN_LEN ( 1 ) - -#define DOT11F_IE_HCF_MAX_LEN ( 1 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeHCF(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEHCF*); - -tANI_U32 dot11fPackIeHCF(tpAniSirGlobal, tDot11fIEHCF*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEHCF(tpAniSirGlobal, tDot11fIEHCF*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ // EID 4 (0x04) typedef struct sDot11fIEIGTK { tANI_U8 present; @@ -1885,269 +1808,6 @@ tANI_U32 dot11fGetPackedIEIGTK(tpAniSirGlobal, tDot11fIEIGTK*, tANI_U32*); #ifdef __cplusplus }; /* End extern "C". */ #endif /* C++ */ -// EID 9 (0x09) -typedef struct sDot11fIELLAttr { - tANI_U8 present; - tANI_U32 defer_threshold; -} tDot11fIELLAttr; - -#define DOT11F_EID_LLATTR ( 9 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_LLATTR_MIN_LEN ( 4 ) - -#define DOT11F_IE_LLATTR_MAX_LEN ( 4 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeLLAttr(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIELLAttr*); - -tANI_U32 dot11fPackIeLLAttr(tpAniSirGlobal, tDot11fIELLAttr*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIELLAttr(tpAniSirGlobal, tDot11fIELLAttr*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 8 (0x08) -typedef struct sDot11fIELoadBalance { - tANI_U8 present; - tANI_U8 bssid[6]; - tANI_U8 channel; -} tDot11fIELoadBalance; - -#define DOT11F_EID_LOADBALANCE ( 8 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_LOADBALANCE_MIN_LEN ( 7 ) - -#define DOT11F_IE_LOADBALANCE_MAX_LEN ( 7 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeLoadBalance(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIELoadBalance*); - -tANI_U32 dot11fPackIeLoadBalance(tpAniSirGlobal, tDot11fIELoadBalance*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIELoadBalance(tpAniSirGlobal, tDot11fIELoadBalance*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 6 (0x06) -typedef struct sDot11fIELoadInfo { - tANI_U8 present; - tANI_U16 num_stas; - tANI_U16 channel_util; -} tDot11fIELoadInfo; - -#define DOT11F_EID_LOADINFO ( 6 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_LOADINFO_MIN_LEN ( 4 ) - -#define DOT11F_IE_LOADINFO_MAX_LEN ( 4 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeLoadInfo(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIELoadInfo*); - -tANI_U32 dot11fPackIeLoadInfo(tpAniSirGlobal, tDot11fIELoadInfo*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIELoadInfo(tpAniSirGlobal, tDot11fIELoadInfo*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 7 (0x07) -typedef struct sDot11fIEPropAssocType { - tANI_U8 present; - tANI_U8 type; -} tDot11fIEPropAssocType; - -#define DOT11F_EID_PROPASSOCTYPE ( 7 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_PROPASSOCTYPE_MIN_LEN ( 1 ) - -#define DOT11F_IE_PROPASSOCTYPE_MAX_LEN ( 1 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIePropAssocType(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEPropAssocType*); - -tANI_U32 dot11fPackIePropAssocType(tpAniSirGlobal, tDot11fIEPropAssocType*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEPropAssocType(tpAniSirGlobal, tDot11fIEPropAssocType*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 10 (0x0a) -typedef struct sDot11fIEPropCapability { - tANI_U8 present; - tANI_U16 capability; -} tDot11fIEPropCapability; - -#define DOT11F_EID_PROPCAPABILITY ( 10 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_PROPCAPABILITY_MIN_LEN ( 2 ) - -#define DOT11F_IE_PROPCAPABILITY_MAX_LEN ( 2 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIePropCapability(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEPropCapability*); - -tANI_U32 dot11fPackIePropCapability(tpAniSirGlobal, tDot11fIEPropCapability*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEPropCapability(tpAniSirGlobal, tDot11fIEPropCapability*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 15 (0x0f) -typedef struct sDot11fIEPropChannSwitchAnn { - tANI_U8 present; - tANI_U8 mode; - tANI_U8 primary_channel; - tANI_U8 sub_band; - tANI_U8 channel_switch_count; -} tDot11fIEPropChannSwitchAnn; - -#define DOT11F_EID_PROPCHANNSWITCHANN ( 15 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_PROPCHANNSWITCHANN_MIN_LEN ( 4 ) - -#define DOT11F_IE_PROPCHANNSWITCHANN_MAX_LEN ( 4 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIePropChannSwitchAnn(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEPropChannSwitchAnn*); - -tANI_U32 dot11fPackIePropChannSwitchAnn(tpAniSirGlobal, tDot11fIEPropChannSwitchAnn*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEPropChannSwitchAnn(tpAniSirGlobal, tDot11fIEPropChannSwitchAnn*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 12 (0x0c) -typedef struct sDot11fIEPropEDCAParams { - tANI_U8 present; - tANI_U8 qos; - tANI_U8 reserved; - tANI_U8 acbe_aifsn: 4; - tANI_U8 acbe_acm: 1; - tANI_U8 acbe_aci: 2; - tANI_U8 unused1: 1; - tANI_U8 acbe_min: 4; - tANI_U8 acbe_max: 4; - tANI_U16 acbe_txoplimit; - tANI_U8 acbk_aifsn: 4; - tANI_U8 acbk_acm: 1; - tANI_U8 acbk_aci: 2; - tANI_U8 unused2: 1; - tANI_U8 acbk_min: 4; - tANI_U8 acbk_max: 4; - tANI_U16 acbk_txoplimit; - tANI_U8 acvi_aifsn: 4; - tANI_U8 acvi_acm: 1; - tANI_U8 acvi_aci: 2; - tANI_U8 unused3: 1; - tANI_U8 acvi_min: 4; - tANI_U8 acvi_max: 4; - tANI_U16 acvi_txoplimit; - tANI_U8 acvo_aifsn: 4; - tANI_U8 acvo_acm: 1; - tANI_U8 acvo_aci: 2; - tANI_U8 unused4: 1; - tANI_U8 acvo_min: 4; - tANI_U8 acvo_max: 4; - tANI_U16 acvo_txoplimit; -} tDot11fIEPropEDCAParams; - -#define DOT11F_EID_PROPEDCAPARAMS ( 12 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_PROPEDCAPARAMS_MIN_LEN ( 18 ) - -#define DOT11F_IE_PROPEDCAPARAMS_MAX_LEN ( 18 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIePropEDCAParams(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEPropEDCAParams*); - -tANI_U32 dot11fPackIePropEDCAParams(tpAniSirGlobal, tDot11fIEPropEDCAParams*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEPropEDCAParams(tpAniSirGlobal, tDot11fIEPropEDCAParams*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 16 (0x10) -typedef struct sDot11fIEPropQuietBSS { - tANI_U8 present; - tANI_U8 quiet_count; - tANI_U8 quiet_period; - tANI_U16 quiet_duration; - tANI_U16 quiet_offset; -} tDot11fIEPropQuietBSS; - -#define DOT11F_EID_PROPQUIETBSS ( 16 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_PROPQUIETBSS_MIN_LEN ( 6 ) - -#define DOT11F_IE_PROPQUIETBSS_MAX_LEN ( 6 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIePropQuietBSS(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEPropQuietBSS*); - -tANI_U32 dot11fPackIePropQuietBSS(tpAniSirGlobal, tDot11fIEPropQuietBSS*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEPropQuietBSS(tpAniSirGlobal, tDot11fIEPropQuietBSS*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 0 (0x00) -typedef struct sDot11fIEPropSuppRates { - tANI_U8 present; - tANI_U8 num_rates; - tANI_U8 rates[12]; -} tDot11fIEPropSuppRates; - -#define DOT11F_EID_PROPSUPPRATES ( 0 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_PROPSUPPRATES_MIN_LEN ( 1 ) - -#define DOT11F_IE_PROPSUPPRATES_MAX_LEN ( 12 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIePropSuppRates(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEPropSuppRates*); - -tANI_U32 dot11fPackIePropSuppRates(tpAniSirGlobal, tDot11fIEPropSuppRates*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEPropSuppRates(tpAniSirGlobal, tDot11fIEPropSuppRates*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ // EID 3 (0x03) typedef struct sDot11fIER0KH_ID { tANI_U8 present; @@ -2225,141 +1885,6 @@ tANI_U32 dot11fGetPackedIETSFInfo(tpAniSirGlobal, tDot11fIETSFInfo*, tANI_U32*); #ifdef __cplusplus }; /* End extern "C". */ #endif /* C++ */ -// EID 18 (0x12) -typedef struct sDot11fIETaurus { - tANI_U8 present; - tANI_U16 baTIDBitmap; - tANI_U16 baPolicy; - tANI_U16 baBufferSize: 12; - tANI_U16 rsvd: 4; -} tDot11fIETaurus; - -#define DOT11F_EID_TAURUS ( 18 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_TAURUS_MIN_LEN ( 6 ) - -#define DOT11F_IE_TAURUS_MAX_LEN ( 6 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeTaurus(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIETaurus*); - -tANI_U32 dot11fPackIeTaurus(tpAniSirGlobal, tDot11fIETaurus*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIETaurus(tpAniSirGlobal, tDot11fIETaurus*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 14 (0x0e) -typedef struct sDot11fIETitan { - tANI_U8 present; - tANI_U8 concat_tcid_bitmap; - tANI_U8 compression_tcid_bitmap; - tANI_U8 cb_state; - tANI_U8 rev_fcs_state; -} tDot11fIETitan; - -#define DOT11F_EID_TITAN ( 14 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_TITAN_MIN_LEN ( 4 ) - -#define DOT11F_IE_TITAN_MAX_LEN ( 4 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeTitan(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIETitan*); - -tANI_U32 dot11fPackIeTitan(tpAniSirGlobal, tDot11fIETitan*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIETitan(tpAniSirGlobal, tDot11fIETitan*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 17 (0x11) -typedef struct sDot11fIETriggerStaBgScan { - tANI_U8 present; - tANI_U8 enable; -} tDot11fIETriggerStaBgScan; - -#define DOT11F_EID_TRIGGERSTABGSCAN ( 17 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_TRIGGERSTABGSCAN_MIN_LEN ( 1 ) - -#define DOT11F_IE_TRIGGERSTABGSCAN_MAX_LEN ( 1 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeTriggerStaBgScan(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIETriggerStaBgScan*); - -tANI_U32 dot11fPackIeTriggerStaBgScan(tpAniSirGlobal, tDot11fIETriggerStaBgScan*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIETriggerStaBgScan(tpAniSirGlobal, tDot11fIETriggerStaBgScan*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 11 (0x0b) -typedef struct sDot11fIEVersion { - tANI_U8 present; - tANI_U32 chip_rev; - tANI_U8 card_type; - tANI_U8 num_build_version; - tANI_U8 build_version[20]; -} tDot11fIEVersion; - -#define DOT11F_EID_VERSION ( 11 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_VERSION_MIN_LEN ( 5 ) - -#define DOT11F_IE_VERSION_MAX_LEN ( 25 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeVersion(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEVersion*); - -tANI_U32 dot11fPackIeVersion(tpAniSirGlobal, tDot11fIEVersion*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEVersion(tpAniSirGlobal, tDot11fIEVersion*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 3 (0x03) -typedef struct sDot11fIEWDS { - tANI_U8 present; - tANI_U8 num_wdsData; - tANI_U8 wdsData[64]; -} tDot11fIEWDS; - -#define DOT11F_EID_WDS ( 3 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_WDS_MIN_LEN ( 0 ) - -#define DOT11F_IE_WDS_MAX_LEN ( 64 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeWDS(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEWDS*); - -tANI_U32 dot11fPackIeWDS(tpAniSirGlobal, tDot11fIEWDS*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEWDS(tpAniSirGlobal, tDot11fIEWDS*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ // EID 51 (0x33) typedef struct sDot11fIEAPChannelReport { tANI_U8 present; @@ -3128,47 +2653,6 @@ tANI_U32 dot11fGetPackedIEAID(tpAniSirGlobal, tDot11fIEAID*, tANI_U32*); #ifdef __cplusplus }; /* End extern "C". */ #endif /* C++ */ -// EID 221 (0xdd) {OUI 0x00, 0x0a, 0xf5} -typedef struct sDot11fIEAirgo { - tANI_U8 present; - tDot11fIEPropSuppRates PropSuppRates; - tDot11fIEAPName APName; - tDot11fIEHCF HCF; - tDot11fIEWDS WDS; - tDot11fIEBPIndicator BPIndicator; - tDot11fIELoadInfo LoadInfo; - tDot11fIELoadBalance LoadBalance; - tDot11fIEPropAssocType PropAssocType; - tDot11fIELLAttr LLAttr; - tDot11fIEPropCapability PropCapability; - tDot11fIEVersion Version; - tDot11fIEPropEDCAParams PropEDCAParams; - tDot11fIETitan Titan; - tDot11fIEPropChannSwitchAnn PropChannSwitchAnn; - tDot11fIEPropQuietBSS PropQuietBSS; - tDot11fIETriggerStaBgScan TriggerStaBgScan; - tDot11fIETaurus Taurus; -} tDot11fIEAirgo; - -#define DOT11F_EID_AIRGO ( 221 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_AIRGO_MIN_LEN ( 3 ) - -#define DOT11F_IE_AIRGO_MAX_LEN ( 230 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeAirgo(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEAirgo*); - -tANI_U32 dot11fPackIeAirgo(tpAniSirGlobal, tDot11fIEAirgo*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEAirgo(tpAniSirGlobal, tDot11fIEAirgo*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ // EID 4 (0x04) typedef struct sDot11fIECFParams { tANI_U8 present; @@ -6380,7 +5864,6 @@ typedef struct sDot11fAssocRequest{ tDot11fIEHTCaps HTCaps; tDot11fIEWMMCaps WMMCaps; tDot11fIEWMMInfoStation WMMInfoStation; - tDot11fIEAirgo Airgo; tDot11fIEWscIEOpaque WscIEOpaque; tDot11fIEWAPIOpaque WAPIOpaque; tDot11fIEWAPI WAPI; @@ -6433,7 +5916,6 @@ typedef struct sDot11fAssocResponse{ tDot11fIEESETxmitPower ESETxmitPower; tANI_U16 num_WMMTSPEC; tDot11fIEWMMTSPEC WMMTSPEC[4]; - tDot11fIEAirgo Airgo; tDot11fIEWscAssocRes WscAssocRes; tDot11fIEP2PAssocRes P2PAssocRes; tDot11fIEVHTCaps VHTCaps; @@ -6522,7 +6004,6 @@ typedef struct sDot11fBeacon{ tDot11fIEESERadMgmtCap ESERadMgmtCap; tDot11fIEESETrafStrmMet ESETrafStrmMet; tDot11fIEESETxmitPower ESETxmitPower; - tDot11fIEAirgo Airgo; tDot11fIEWscBeacon WscBeacon; tDot11fIEP2PBeacon P2PBeacon; tDot11fIEVHTCaps VHTCaps; @@ -6596,7 +6077,6 @@ typedef struct sDot11fBeacon2{ tDot11fIEWMMInfoAp WMMInfoAp; tDot11fIEWMMParams WMMParams; tDot11fIEWMMCaps WMMCaps; - tDot11fIEAirgo Airgo; tDot11fIEWscBeacon WscBeacon; tDot11fIEWAPI WAPI; tDot11fIEESERadMgmtCap ESERadMgmtCap; @@ -6665,7 +6145,6 @@ typedef struct sDot11fBeaconIEs{ tDot11fIEESERadMgmtCap ESERadMgmtCap; tDot11fIEESETrafStrmMet ESETrafStrmMet; tDot11fIEESETxmitPower ESETxmitPower; - tDot11fIEAirgo Airgo; tDot11fIEWscBeaconProbeRes WscBeaconProbeRes; tDot11fIEP2PBeaconProbeRes P2PBeaconProbeRes; tDot11fIEVHTCaps VHTCaps; @@ -7266,7 +6745,6 @@ typedef struct sDot11fProbeResponse{ tDot11fIEESERadMgmtCap ESERadMgmtCap; tDot11fIEESETrafStrmMet ESETrafStrmMet; tDot11fIEESETxmitPower ESETxmitPower; - tDot11fIEAirgo Airgo; tDot11fIEWscProbeRes WscProbeRes; tDot11fIEP2PProbeRes P2PProbeRes; tDot11fIEVHTCaps VHTCaps; @@ -7425,7 +6903,6 @@ typedef struct sDot11fReAssocRequest{ tDot11fIEHTCaps HTCaps; tDot11fIEWMMCaps WMMCaps; tDot11fIEWMMInfoStation WMMInfoStation; - tDot11fIEAirgo Airgo; tDot11fIEWscIEOpaque WscIEOpaque; tDot11fIEWAPIOpaque WAPIOpaque; tDot11fIEWAPI WAPI; @@ -7483,7 +6960,6 @@ typedef struct sDot11fReAssocResponse{ tANI_U16 num_WMMTSPEC; tDot11fIEWMMTSPEC WMMTSPEC[4]; tDot11fIEESETrafStrmRateSet ESETrafStrmRateSet; - tDot11fIEAirgo Airgo; tDot11fIEWscReassocRes WscReassocRes; tDot11fIEP2PAssocRes P2PAssocRes; tDot11fIEVHTCaps VHTCaps; diff --git a/CORE/MAC/src/include/dphGlobal.h b/CORE/MAC/src/include/dphGlobal.h index b60188e575e3..ac6a2e1caf41 100644 --- a/CORE/MAC/src/include/dphGlobal.h +++ b/CORE/MAC/src/include/dphGlobal.h @@ -278,8 +278,6 @@ typedef struct sDphHashNode tANI_U8 aniPeer:1; - tANI_U8 titanPeer:1; // flag to indicate if its a titan peer - tANI_U8 fAniCount:1; tANI_U8 rmfEnabled:1; @@ -332,15 +330,11 @@ typedef struct sDphHashNode #endif - //Taurus capabilities - tANI_U16 baPolicyFlag; //BA Policy for each TID. /* - - * All the legacy and airgo supported rates. - + * All the legacy supported rates. */ tSirSupportedRates supportedRates; diff --git a/CORE/MAC/src/include/parserApi.h b/CORE/MAC/src/include/parserApi.h index da715687130c..1f5e6312793b 100644 --- a/CORE/MAC/src/include/parserApi.h +++ b/CORE/MAC/src/include/parserApi.h @@ -304,9 +304,6 @@ typedef struct sSirEseBcnReportMandatoryIe tANI_U8 sirIsPropCapabilityEnabled(struct sAniSirGlobal *pMac, tANI_U32 bitnum); -tSirRetStatus -sirGetCfgPropCaps(struct sAniSirGlobal *, tANI_U16 *); - void dot11fLog(tpAniSirGlobal pMac, int nSev, const char *lpszFormat, ...); #define CFG_GET_INT(nStatus, pMac, nItem, cfg ) do { \ @@ -505,12 +502,6 @@ PopulateDot11fChanSwitchAnn(tpAniSirGlobal pMac, tDot11fIEChanSwitchAnn *pDot11f, tpPESession psessionEntry); -/// Populate a tDot11fIEChanSwitchAnn -void -PopulateDot11fExtChanSwitchAnn(tpAniSirGlobal pMac, - tDot11fIEExtChanSwitchAnn *pDot11f, - tpPESession psessionEntry); - /// Populate a tDot11fIEChannelSwitchWrapper void PopulateDot11fChanSwitchWrapper(tpAniSirGlobal pMac, @@ -573,11 +564,6 @@ PopulateDot11fExtSuppRates1(tpAniSirGlobal pMac, tDot11fIEExtSuppRates *pDot11f); tSirRetStatus -PopulateDot11fHCF(tpAniSirGlobal pMac, - tANI_U32 capEnable, - tDot11fIEHCF *pDot11f); - -tSirRetStatus PopulateDot11fHTCaps(tpAniSirGlobal pMac, tpPESession psessionEntry, tDot11fIEHTCaps *pDot11f); @@ -620,26 +606,6 @@ tSirRetStatus PopulateDot11fPowerConstraints(tpAniSirGlobal pMac, tDot11fIEPowerConstraints *pDot11f); -tSirRetStatus -PopulateDot11fPropCapability(tpAniSirGlobal pMac, - tANI_U32 capEnable, - tDot11fIEPropCapability *pDot11f); - -void -PopulateDot11fPropChannSwitchAnn(tpAniSirGlobal pMac, - tANI_U32 capEnable, - tDot11fIEPropChannSwitchAnn *pDot11f); - -void -PopulateDot11fPropEDCAParams(tpAniSirGlobal pMac, - tANI_U16 caps, - tDot11fIEPropEDCAParams *pDot11f); - -tSirRetStatus -PopulateDot11fPropSuppRates(tpAniSirGlobal pMac, - tANI_U32 capEnable, - tDot11fIEPropSuppRates *pDot11f); - void PopulateDot11fQOSCapsAp(tpAniSirGlobal pMac, tDot11fIEQOSCapsAp *pDot11f, tpPESession psessionEntry); diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h index 3bbfefc591cd..4594e3844de9 100644 --- a/CORE/MAC/src/include/sirParams.h +++ b/CORE/MAC/src/include/sirParams.h @@ -244,9 +244,6 @@ typedef struct sSirMbMsgP2p #define SIR_HAL_CCA_CHANGE_MODE (SIR_HAL_ITC_MSG_TYPES_BEGIN + 10) #define SIR_HAL_TIMER_WRAP_AROUND_STATS_COLLECT_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 11) -/* - * New Taurus related messages - */ #define SIR_HAL_ADD_STA_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 13) #define SIR_HAL_ADD_STA_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 14) #define SIR_HAL_DELETE_STA_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 15) diff --git a/CORE/MAC/src/pe/include/limApi.h b/CORE/MAC/src/pe/include/limApi.h index f47aace58e06..d004f2736ad7 100644 --- a/CORE/MAC/src/pe/include/limApi.h +++ b/CORE/MAC/src/pe/include/limApi.h @@ -137,10 +137,6 @@ limGetSmeState(tpAniSirGlobal pMac) { return pMac->lim.gLimSmeState; } limGetSystemRole(tpPESession psessionEntry) { return psessionEntry->limSystemRole; } extern void limReceivedHBHandler(tpAniSirGlobal, tANI_U8, tpPESession); extern void limCheckAndQuietBSS(tpAniSirGlobal); -/// Function to send WDS info to WSM if needed -extern void limProcessWdsInfo(tpAniSirGlobal, tSirPropIEStruct); -/// Function to initialize WDS info params -extern void limInitWdsInfoParams(tpAniSirGlobal); /// Function that triggers STA context deletion extern void limTriggerSTAdeletion(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession psessionEntry); diff --git a/CORE/MAC/src/pe/lim/limAdmitControl.c b/CORE/MAC/src/pe/lim/limAdmitControl.c index cf0665f8d065..de3d14f05f2e 100644 --- a/CORE/MAC/src/pe/lim/limAdmitControl.c +++ b/CORE/MAC/src/pe/lim/limAdmitControl.c @@ -257,7 +257,6 @@ limComputeMeanBwUsed( ctspec, pTspecInfo->assocId); continue; } - //FIXME: need to take care of taurusPeer, titanPeer, 11npeer too. *pBw += LIM_STA_BW_ADJUST(pSta->aniPeer, phyMode, pTspecInfo->tspec.meanDataRate); } } diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c index d03e92c1afae..d49cde92e132 100644 --- a/CORE/MAC/src/pe/lim/limApi.c +++ b/CORE/MAC/src/pe/lim/limApi.c @@ -240,13 +240,6 @@ static void __limInitVars(tpAniSirGlobal pMac) { // Place holder for Measurement Req/Rsp/Ind related info - // WDS info - pMac->lim.gLimNumWdsInfoInd = 0; - pMac->lim.gLimNumWdsInfoSet = 0; - vos_mem_set(&pMac->lim.gLimWdsInfo, sizeof(tSirWdsInfo), 0); - /* initialize some parameters */ - limInitWdsInfoParams(pMac); - // Deferred Queue Paramters vos_mem_set(&pMac->lim.gLimDeferredMsgQ, sizeof(tSirAddtsReq), 0); @@ -333,17 +326,6 @@ static void __limInitAssocVars(tpAniSirGlobal pMac) } - -static void __limInitTitanVars(tpAniSirGlobal pMac) -{ - // Debug workaround for BEACON's - // State change triggered by "dump 222" - pMac->lim.gLimScanOverride = 1; - pMac->lim.gLimScanOverrideSaved = eSIR_ACTIVE_SCAN; - pMac->lim.gLimTitanStaCount = 0; - pMac->lim.gLimBlockNonTitanSta = 0; -} - static void __limInitHTVars(tpAniSirGlobal pMac) { pMac->lim.htCapabilityPresentInBeacon = 0; @@ -400,8 +382,6 @@ static tSirRetStatus __limInitConfig( tpAniSirGlobal pMac ) val16 = ( tANI_U16 ) val1; pHTCapabilityInfo = ( tSirMacHTCapabilityInfo* ) &val16; - //channel bonding mode could be set to anything from 0 to 4(Titan had these - // modes But for Taurus we have only two modes: enable(>0) or disable(=0) pHTCapabilityInfo->supportedChannelWidthSet = val2 ? WNI_CFG_CHANNEL_BONDING_MODE_ENABLE : WNI_CFG_CHANNEL_BONDING_MODE_DISABLE; if(cfgSetInt(pMac, WNI_CFG_HT_CAP_INFO, *(tANI_U16*)pHTCapabilityInfo) @@ -652,7 +632,6 @@ limInitialize(tpAniSirGlobal pMac) __limInitBssVars(pMac); __limInitScanVars(pMac); __limInitHTVars(pMac); - __limInitTitanVars(pMac); status = limStart(pMac); if(eSIR_SUCCESS != status) @@ -1355,62 +1334,6 @@ limReceivedHBHandler(tpAniSirGlobal pMac, tANI_U8 channelId, tpPESession psessio -/* - * limProcessWdsInfo() - * - *FUNCTION: - * This function is called from schBeaconProcess in BP - * - *PARAMS: - * @param pMac - Pointer to Global MAC structure - * @param propIEInfo - proprietary IE info - * - *LOGIC: - * - *ASSUMPTIONS: - * NA - * - *NOTE: - * - * - *RETURNS: - * - */ - -void limProcessWdsInfo(tpAniSirGlobal pMac, - tSirPropIEStruct propIEInfo) -{ -} - - - -/** - * limInitWdsInfoParams() - * - *FUNCTION: - * This function is called while processing - * START_BSS/JOIN/REASSOC_REQ to initialize WDS info - * ind/set related parameters. - * - *LOGIC: - * - *ASSUMPTIONS: - * - *NOTE: - * - * @param pMac Pointer to Global MAC structure - * @return None - */ - -void -limInitWdsInfoParams(tpAniSirGlobal pMac) -{ - pMac->lim.gLimWdsInfo.wdsLength = 0; - pMac->lim.gLimNumWdsInfoInd = 0; - pMac->lim.gLimNumWdsInfoSet = 0; -} /*** limInitWdsInfoParams() ***/ - - /** ------------------------------------------------------------- \fn limUpdateOverlapStaParam \brief Updates overlap cache and param data structure diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c index a3e9dbe0bace..c01803c284c8 100644 --- a/CORE/MAC/src/pe/lim/limAssocUtils.c +++ b/CORE/MAC/src/pe/lim/limAssocUtils.c @@ -650,7 +650,7 @@ limCleanupRxPath(tpAniSirGlobal pMac, tpDphHashNode pStaDs,tpPESession psessionE if (!pStaDs->mlmStaContext.updateContext) { /** - * There is no context at Polaris to delete. + * There is no context to delete. * Release our assigned AID back to the free pool */ if ((psessionEntry->limSystemRole == eLIM_AP_ROLE) || @@ -908,7 +908,7 @@ limSendDelStaCnf(tpAniSirGlobal pMac, tSirMacAddr staDsAddr, *FUNCTION: * This function is called whenever Re/Association Request need * to be rejected due to failure in assigning an AID or failure - * in adding STA context at Polaris or reject by applications. + * in adding STA context reject by applications. * *LOGIC: * Resources allocated if any are freedup and (Re) Association @@ -928,7 +928,6 @@ limSendDelStaCnf(tpAniSirGlobal pMac, tSirMacAddr staDsAddr, * @param staId - Indicates staId of the STA being rejected * association * @param deleteSta - Indicates whether to delete STA context - * at Polaris * @param rCode - Indicates what reasonCode to be sent in * Re/Assoc response to STA * @@ -980,7 +979,6 @@ limRejectAssociation(tpAniSirGlobal pMac, tSirMacAddr peerAddr, tANI_U8 subType, } /** - * Polaris has state for this STA. * Trigger cleanup. */ pStaDs->mlmStaContext.cleanupTrigger = eLIM_REASSOC_REJECT; @@ -1442,7 +1440,7 @@ limPostReassocFailure(tpAniSirGlobal pMac, * *LOGIC: * Reassociation failure timer is stopped, Old (or current) AP's - * context is restored both at Polaris & software + * context is restored at software * *ASSUMPTIONS: * @@ -2013,7 +2011,6 @@ limPopulateMatchingRateSet(tpAniSirGlobal pMac, tSirMacRateSet *pOperRateSet, tSirMacRateSet *pExtRateSet, tANI_U8* pSupportedMCSSet, - tSirMacPropRateSet *pAniLegRateSet, tpPESession psessionEntry, tDot11fIEVHTCaps *pVHTCaps) @@ -2024,7 +2021,6 @@ limPopulateMatchingRateSet(tpAniSirGlobal pMac, tSirMacRateSet *pOperRateSet, tSirMacRateSet *pExtRateSet, tANI_U8* pSupportedMCSSet, - tSirMacPropRateSet *pAniLegRateSet, tpPESession psessionEntry) #endif { @@ -2182,20 +2178,6 @@ limPopulateMatchingRateSet(tpAniSirGlobal pMac, } } } - - - //Now add the Polaris rates only when Proprietary rates are enabled. - val = 0; - if(wlan_cfgGetInt(pMac, WNI_CFG_PROPRIETARY_RATES_ENABLED, &val) != eSIR_SUCCESS) - { - limLog(pMac, LOGP, FL("could not retrieve prop rate enabled flag from CFG")); - } - else if(val) - { - for(i=0; i<pAniLegRateSet->numPropRates; i++) - rates->aniLegacyRates[i] = pAniLegRateSet->propRate[i]; - } - } diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.h b/CORE/MAC/src/pe/lim/limAssocUtils.h index 0ba084232cf5..2d5b2709fbfc 100644 --- a/CORE/MAC/src/pe/lim/limAssocUtils.h +++ b/CORE/MAC/src/pe/lim/limAssocUtils.h @@ -101,7 +101,6 @@ limPopulateMatchingRateSet(tpAniSirGlobal pMac, tSirMacRateSet *pOperRateSet, tSirMacRateSet *pExtRateSet, tANI_U8* pSupportedMCSSet, - tSirMacPropRateSet *pAniLegRateSet, tpPESession psessionEntry, tDot11fIEVHTCaps *pVHTCaps); #else @@ -110,7 +109,7 @@ tSirRetStatus limPopulateMatchingRateSet(tpAniSirGlobal, tSirMacRateSet *, tSirMacRateSet *, tANI_U8* pSupportedMCSSet, - tSirMacPropRateSet *, tpPESession); + tpPESession); #endif diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c index dbdd5ef5870f..34db4a4f408a 100644 --- a/CORE/MAC/src/pe/lim/limFT.c +++ b/CORE/MAC/src/pe/lim/limFT.c @@ -1874,16 +1874,8 @@ limProcessFTAggrQosReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf ) limSetActiveEdcaParams(pMac, psessionEntry->gLimEdcaParams, psessionEntry); - if (pSta->aniPeer == eANI_BOOLEAN_TRUE) - { - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, - pSta->bssId, eANI_BOOLEAN_TRUE); - } - else - { - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, - pSta->bssId, eANI_BOOLEAN_FALSE); - } + limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, + pSta->bssId); if(eSIR_SUCCESS != limTspecAdd(pMac, pSta->staAddr, pSta->assocId, pTspec, 0, &tspecInfo)) diff --git a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c index 3500058193b2..0f2810853782 100644 --- a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c +++ b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c @@ -57,9 +57,9 @@ * *FUNCTION: * This function is called while adding a context at - * DPH & Polaris for a peer in IBSS. + * DPH for a peer in IBSS. * If peer is found in the list, capabilities from the - * returned BSS description are used at DPH node & Polaris. + * returned BSS description are used at DPH node. * *LOGIC: * @@ -366,12 +366,12 @@ ibss_sta_rates_update( #ifdef WLAN_FEATURE_11AC limPopulateMatchingRateSet(pMac, pStaDs, &pPeer->supportedRates, &pPeer->extendedRates, pPeer->supportedMCSSet, - &pStaDs->mlmStaContext.propRateSet,psessionEntry, &pPeer->VHTCaps); + psessionEntry, &pPeer->VHTCaps); #else // Populate supported rateset limPopulateMatchingRateSet(pMac, pStaDs, &pPeer->supportedRates, &pPeer->extendedRates, pPeer->supportedMCSSet, - &pStaDs->mlmStaContext.propRateSet,psessionEntry); + psessionEntry); #endif pStaDs->mlmStaContext.capabilityInfo = pPeer->capabilityInfo; @@ -381,8 +381,7 @@ ibss_sta_rates_update( * ibss_sta_info_update * *FUNCTION: - * This is called to program both SW & Polaris context - * for peer in IBSS. + * This is called to program SW context for peer in IBSS. * *LOGIC: * @@ -960,9 +959,9 @@ limIbssDecideProtection(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpUpdateBeaco * *FUNCTION: * This function is called while adding a context at - * DPH & Polaris for a peer in IBSS. + * DPH for a peer in IBSS. * If peer is found in the list, capabilities from the - * returned BSS description are used at DPH node & Polaris. + * returned BSS description are used at DPH node. * *LOGIC: * diff --git a/CORE/MAC/src/pe/lim/limLogDump.c b/CORE/MAC/src/pe/lim/limLogDump.c index 34ff3082a61a..5f5c38fdcfd5 100644 --- a/CORE/MAC/src/pe/lim/limLogDump.c +++ b/CORE/MAC/src/pe/lim/limLogDump.c @@ -171,8 +171,8 @@ char *dumpLim( tpAniSirGlobal pMac, char *p, tANI_U32 sessionId) pSta->mlmStaContext.authType, limMlmStateStr(pSta->mlmStaContext.mlmState)); - p += log_sprintf( pMac,p, "\tAID:%-2d OpRateMode:%s ShPrmbl:%d HT:%d GF:%d TxChWidth:%d MimoPS:%d LsigProt:%d\n", - pSta->assocId, limStaOpRateModeStr(pSta->supportedRates.opRateMode), + p += log_sprintf( pMac,p, "\tAID:%-2d ShPrmbl:%d HT:%d GF:%d TxChWidth:%d MimoPS:%d LsigProt:%d\n", + pSta->assocId, pSta->shortPreambleEnabled, pSta->mlmStaContext.htCapability, pSta->htGreenfield, pSta->htSupportedChannelWidthSet, pSta->htMIMOPSState, pSta->htLsigTXOPProtection); @@ -192,14 +192,6 @@ char *dumpLim( tpAniSirGlobal pMac, char *p, tANI_U32 sessionId) for(j=0; j<SIR_NUM_11A_RATES; j++) if(pSta->supportedRates.llaRates[j] > 0) p += log_sprintf( pMac,p, "%d ", pSta->supportedRates.llaRates[j]); - - p += log_sprintf( pMac,p, "\n\tPolaris Rates: "); - for(j=0; j<SIR_NUM_POLARIS_RATES; j++) - if(pSta->supportedRates.aniLegacyRates[j] > 0) - p += log_sprintf( pMac,p, "%d ", pSta->supportedRates.aniLegacyRates[j]); - - p += log_sprintf( pMac,p, "\n\tTitan and Taurus Proprietary Rate Bitmap: %08x\n", - pSta->supportedRates.aniEnhancedRateBitmap); p += log_sprintf( pMac,p, "\tMCS Rate Set Bitmap: "); for(j=0; j<SIR_MAC_MAX_SUPPORTED_MCS_SET; j++) p += log_sprintf( pMac,p, "%x ", pSta->supportedRates.supportedMCSSet[j]); @@ -241,8 +233,7 @@ char *dumpLim( tpAniSirGlobal pMac, char *p, tANI_U32 sessionId) pTemp->peerMacAddr[3], pTemp->peerMacAddr[4], pTemp->peerMacAddr[5]); - p += log_sprintf( pMac,p, " %d %d,%d %d %d %04X %d,%d\n", - pTemp->aniIndicator, + p += log_sprintf( pMac,p, " %d,%d %d %d %04X %d,%d\n", pTemp->edcaPresent, pTemp->wmeEdcaPresent, pTemp->wmeInfoPresent, pTemp->htCapable, @@ -255,12 +246,6 @@ char *dumpLim( tpAniSirGlobal pMac, char *p, tANI_U32 sessionId) } p += log_sprintf( pMac,p, "System Scan/Learn Mode bit = %d\n", pMac->lim.gLimSystemInScanLearnMode); - p += log_sprintf( pMac,p, "Scan override = %d\n", - pMac->lim.gLimScanOverride); - p += log_sprintf( pMac,p, "CB State protection = %d\n", - pMac->lim.gLimCBStateProtection); - p += log_sprintf( pMac,p, "Count of Titan STA's = %d\n", - pMac->lim.gLimTitanStaCount); //current BSS capability p += log_sprintf( pMac,p, "**********Current BSS Capability********\n"); diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c index 9d482d9cd685..b2aedde0efed 100644 --- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c @@ -792,12 +792,8 @@ __limProcessAddTsRsp(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession pse pStaDs = dphGetHashEntry(pMac, DPH_STA_HASH_INDEX_PEER, &psessionEntry->dph.dphHashTable); if (pStaDs != NULL) - { - if (pStaDs->aniPeer == eANI_BOOLEAN_TRUE) - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_TRUE); - else - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_FALSE); - } + limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, + pStaDs->bssId); else limLog(pMac, LOGE, FL("Self entry missing in Hash Table ")); @@ -1047,12 +1043,8 @@ __limProcessDelTsReq(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession pse pStaDs = dphGetHashEntry(pMac, DPH_STA_HASH_INDEX_PEER, &psessionEntry->dph.dphHashTable); if (pStaDs != NULL) - { - if (pStaDs->aniPeer == eANI_BOOLEAN_TRUE) - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_TRUE); - else - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_FALSE); - } + limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, + pStaDs->bssId); else limLog(pMac, LOGE, FL("Self entry missing in Hash Table ")); diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c index 708398ca87a0..06c4be981877 100644 --- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c @@ -1139,17 +1139,7 @@ sendIndToSme: pStaDs->shortPreambleEnabled = (tANI_U8)pAssocReq->capabilityInfo.shortPreamble; pStaDs->shortSlotTimeEnabled = (tANI_U8)pAssocReq->capabilityInfo.shortSlotTime; - if (pAssocReq->propIEinfo.versionPresent) //update STA version info - { - pStaDs->versionPresent = 1; - pStaDs->version = pAssocReq->propIEinfo.version; - } pStaDs->propCapability = 0; - if (pAssocReq->propIEinfo.capabilityPresent) - { - if (sirGetCfgPropCaps(pMac, &pStaDs->propCapability)) - pStaDs->propCapability &= pAssocReq->propIEinfo.capability; - } pStaDs->valid = 0; pStaDs->mlmStaContext.authType = authType; @@ -1233,8 +1223,7 @@ if (limPopulateMatchingRateSet(pMac, &(pAssocReq->supportedRates), &(pAssocReq->extendedRates), pAssocReq->HTCaps.supportedMCSSet, - &(pAssocReq->propIEinfo.propRates), - psessionEntry , &pAssocReq->VHTCaps) + psessionEntry, &pAssocReq->VHTCaps) != eSIR_SUCCESS) #else @@ -1243,7 +1232,7 @@ if (limPopulateMatchingRateSet(pMac, &(pAssocReq->supportedRates), &(pAssocReq->extendedRates), pAssocReq->HTCaps.supportedMCSSet, - &(pAssocReq->propIEinfo.propRates), psessionEntry) != eSIR_SUCCESS) + psessionEntry) != eSIR_SUCCESS) #endif { // Could not update hash table entry at DPH with rateset @@ -1276,10 +1265,6 @@ if (limPopulateMatchingRateSet(pMac, } #endif - vos_mem_copy((tANI_U8 *) &pStaDs->mlmStaContext.propRateSet, - (tANI_U8 *) &(pAssocReq->propIEinfo.propRates), - pAssocReq->propIEinfo.propRates.numPropRates + 1); - /// Add STA context at MAC HW (BMU, RHP & TFP) pStaDs->qosMode = eANI_BOOLEAN_FALSE; diff --git a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c index cceb1cc3b084..acdd05deca0d 100644 --- a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c @@ -79,9 +79,7 @@ extern tSirRetStatus schBeaconEdcaProcess(tpAniSirGlobal pMac, tSirMacEdcaParamS */ void limUpdateAssocStaDatas(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpSirAssocRsp pAssocRsp,tpPESession psessionEntry) { - tANI_U32 prop; tANI_U32 phyMode; - tANI_U32 val; tANI_BOOLEAN qosMode; tANI_U16 rxHighestRate = 0; @@ -90,17 +88,6 @@ void limUpdateAssocStaDatas(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpSirAsso pStaDs->staType= STA_ENTRY_SELF; limGetQosMode(psessionEntry, &qosMode); - // set the ani peer bit, if self mode is one of the proprietary modes - if(IS_DOT11_MODE_PROPRIETARY(psessionEntry->dot11mode)) - { - wlan_cfgGetInt(pMac, WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED, &prop); - - if (prop) - { - pStaDs->aniPeer = eHAL_SET; - pStaDs->propCapability = pAssocRsp->propIEinfo.capability; - } - } pStaDs->mlmStaContext.authType = psessionEntry->limCurrentAuthType; @@ -170,16 +157,6 @@ void limUpdateAssocStaDatas(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpSirAsso pStaDs->erpEnabled = eHAL_SET; - val = WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET_LEN; - if (wlan_cfgGetStr(pMac, WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET, - (tANI_U8 *) &pStaDs->mlmStaContext.propRateSet.propRate, - &val) != eSIR_SUCCESS) { - /// Could not get prop rateset from CFG. Log error. - limLog(pMac, LOGP, FL("could not retrieve prop rateset")); - return; - } - pStaDs->mlmStaContext.propRateSet.numPropRates = (tANI_U8) val; - pStaDs->qosMode = 0; pStaDs->lleEnabled = 0; @@ -647,16 +624,7 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub // along with STATUS CODE // Return Assoc confirm to SME with received failure code - - if (pAssocRsp->propIEinfo.loadBalanceInfoPresent) - { - mlmAssocCnf.resultCode = eSIR_SME_TRANSFER_STA; - vos_mem_copy(pMac->lim.gLimAlternateRadio.bssId, - pAssocRsp->propIEinfo.alternateRadio.bssId, sizeof(tSirMacAddr)); - pMac->lim.gLimAlternateRadio.channelId = - pAssocRsp->propIEinfo.alternateRadio.channelId; - }else - mlmAssocCnf.resultCode = eSIR_SME_ASSOC_REFUSED; + mlmAssocCnf.resultCode = eSIR_SME_ASSOC_REFUSED; // Delete Pre-auth context for the associated BSS if (limSearchPreAuthList(pMac, pHdr->sa)) @@ -783,16 +751,8 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub if (!psessionEntry->bRoamSynchInProgress) { #endif - if (pStaDs->aniPeer == eANI_BOOLEAN_TRUE) - { - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, - pStaDs->bssId, eANI_BOOLEAN_TRUE); - } - else - { - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, - pStaDs->bssId, eANI_BOOLEAN_FALSE); - } + limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, + pStaDs->bssId); #ifdef WLAN_FEATURE_ROAM_OFFLOAD } #endif diff --git a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c index 43cbb1269eab..c304b3beedc1 100644 --- a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c +++ b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c @@ -655,8 +655,6 @@ limApplyConfiguration(tpAniSirGlobal pMac,tpPESession psessionEntry) PELOG2(limLog(pMac, LOG2, FL("Applying config"));) - limInitWdsInfoParams(pMac); - psessionEntry->limSentCapsChangeNtf = false; limGetPhyMode(pMac, &phyMode, psessionEntry); diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c index 005a351e3bc3..8d0e251ebe88 100644 --- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c @@ -1158,7 +1158,6 @@ limFillAssocIndParams(tpAniSirGlobal pMac, tpLimMlmAssocInd pAssocInd, (tANI_U8 *) &(pAssocInd->addIE.addIEdata), pAssocInd->addIE.length); - // Copy the new TITAN capabilities pSirSmeAssocInd->spectrumMgtIndicator = pAssocInd->spectrumMgtIndicator; if (pAssocInd->spectrumMgtIndicator == eSIR_TRUE) { @@ -1327,8 +1326,6 @@ limProcessMlmDisassocInd(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) PELOG1(limLog(pMac, LOG1, FL("*** Peer staId=%d Disassociated ***"), pMlmDisassocInd->aid);) - // Send SME_DISASOC_IND after Polaris cleanup - // (after receiving LIM_MLM_PURGE_STA_IND) break; } // end switch (psessionEntry->limSystemRole) } /*** end limProcessMlmDisassocInd() ***/ @@ -1462,8 +1459,6 @@ limProcessMlmDeauthInd(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) FL("*** Received Deauthentication from staId=%d ***"), pMlmDeauthInd->aid);) } - // Send SME_DEAUTH_IND after Polaris cleanup - // (after receiving LIM_MLM_PURGE_STA_IND) break; } // end switch (psessionEntry->limSystemRole) } /*** end limProcessMlmDeauthInd() ***/ @@ -1609,7 +1604,7 @@ limProcessMlmPurgeStaInd(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) break; } PELOG1(limLog(pMac, LOG1, - FL("*** Polaris cleanup completed for staId=%d ***"), + FL("*** Cleanup completed for staId=%d ***"), pMlmPurgeStaInd->aid);) if ((psessionEntry->limSystemRole == eLIM_STA_ROLE)||(psessionEntry->limSystemRole == eLIM_BT_AMP_STA_ROLE)) { @@ -3139,12 +3134,8 @@ limProcessStaMlmAddBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,tpPESession ps pStaDs->ucBcastSig = pAddBssParams->staContext.ucBcastSig; // Downgrade the EDCA parameters if needed limSetActiveEdcaParams(pMac, psessionEntry->gLimEdcaParams, psessionEntry); - // Send the active EDCA parameters to HAL - if (pStaDs->aniPeer == eANI_BOOLEAN_TRUE) { - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_TRUE); - } else { - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_FALSE); - } + limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, + pStaDs->bssId); #if defined WLAN_FEATURE_VOWIFI rrmCacheMgmtTxPower( pMac, pAddBssParams->txMgmtPower, psessionEntry ); #endif diff --git a/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c b/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c index 8f981ae6ac2f..ddb1bb94072f 100644 --- a/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c @@ -117,8 +117,6 @@ limProcessProbeRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession pProbeRsp->ssId.length = 0; pProbeRsp->wpa.length = 0; - pProbeRsp->propIEinfo.apName.length = 0; - pHdr = WDA_GET_RX_MAC_HEADER(pRxPacketInfo); @@ -266,8 +264,7 @@ limProcessProbeRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession if (psessionEntry->limSystemRole == eLIM_STA_ROLE) { - if (pProbeRsp->channelSwitchPresent || - pProbeRsp->propIEinfo.propChannelSwitchPresent) + if (pProbeRsp->channelSwitchPresent) { limUpdateChannelSwitch(pMac, pProbeRsp, psessionEntry); } @@ -305,10 +302,8 @@ limProcessProbeRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession // If needed, downgrade the EDCA parameters limSetActiveEdcaParams(pMac, psessionEntry->gLimEdcaParams, psessionEntry); - if (pStaDs->aniPeer == eANI_BOOLEAN_TRUE) - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_TRUE); - else - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_FALSE); + limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, + pStaDs->bssId); } else PELOGE(limLog(pMac, LOGE, FL("Self Entry missing in Hash Table"));) @@ -349,8 +344,6 @@ limProcessProbeRspFrameNoSession(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo) pProbeRsp->ssId.length = 0; pProbeRsp->wpa.length = 0; - pProbeRsp->propIEinfo.apName.length = 0; - pHdr = WDA_GET_RX_MAC_HEADER(pRxPacketInfo); diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c index 442bbb2442fa..deef6ebd266b 100644 --- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c @@ -4282,10 +4282,8 @@ __limProcessSmeDeltsReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) pStaDs = dphGetHashEntry(pMac, DPH_STA_HASH_INDEX_PEER, &psessionEntry->dph.dphHashTable); if (pStaDs != NULL) { - if (pStaDs->aniPeer == eANI_BOOLEAN_TRUE) - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_TRUE); - else - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_FALSE); + limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, + pStaDs->bssId); status = eSIR_SUCCESS; } else diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c index 4d77c07ba16b..0a9e3556d1d5 100644 --- a/CORE/MAC/src/pe/lim/limProcessTdls.c +++ b/CORE/MAC/src/pe/lim/limProcessTdls.c @@ -1890,7 +1890,6 @@ limTdlsPopulateMatchingRateSet(tpAniSirGlobal pMac, tANI_U8 *pSupportedRateSet, tANI_U8 supporteRatesLength, tANI_U8* pSupportedMCSSet, - tSirMacPropRateSet *pAniLegRateSet, tpPESession psessionEntry, tDot11fIEVHTCaps *pVHTCaps) @@ -2183,7 +2182,6 @@ static void limTdlsUpdateHashNodeInfo(tpAniSirGlobal pMac, tDphHashNode *pStaDs, limTdlsPopulateMatchingRateSet(pMac, pStaDs, pTdlsAddStaReq->supported_rates, pTdlsAddStaReq->supported_rates_length, (tANI_U8 *)pTdlsAddStaReq->htCap.suppMcsSet, - &pStaDs->mlmStaContext.propRateSet, psessionEntry, pVhtCaps); /* TDLS Dummy AddSTA does not have right capability , is it OK ?? diff --git a/CORE/MAC/src/pe/lim/limPropExtsUtils.c b/CORE/MAC/src/pe/lim/limPropExtsUtils.c index 52ee4967380d..b5bd84ec07db 100644 --- a/CORE/MAC/src/pe/lim/limPropExtsUtils.c +++ b/CORE/MAC/src/pe/lim/limPropExtsUtils.c @@ -245,7 +245,6 @@ ePhyChanBondState limGetHTCBState(ePhyChanBondState aniCBMode) * *FUNCTION: * Based on a combination of the following - - * 1) tDphHashNode.aniPeer * 2) tDphHashNode.propCapability * this API determines if a given STA is an ANI peer or not * @@ -264,19 +263,9 @@ tStaRateMode limGetStaPeerType( tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession psessionEntry) { -tStaRateMode staPeerType = eSTA_11b; - // Determine the peer-STA type - if( pStaDs->aniPeer ) - { - if(PROP_CAPABILITY_GET( TAURUS, pStaDs->propCapability )) - staPeerType = eSTA_TAURUS; - else if( PROP_CAPABILITY_GET( TITAN, pStaDs->propCapability )) - staPeerType = eSTA_TITAN; - else - staPeerType = eSTA_POLARIS; - } + tStaRateMode staPeerType = eSTA_11b; #ifdef WLAN_FEATURE_11AC - else if(pStaDs->mlmStaContext.vhtCapability) + if(pStaDs->mlmStaContext.vhtCapability) staPeerType = eSTA_11ac; #endif else if(pStaDs->mlmStaContext.htCapability) diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c index ca13c053d8c8..77b4f1b8b040 100644 --- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c +++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c @@ -821,7 +821,7 @@ limSendProbeRspMgmtFrame(tpAniSirGlobal pMac, PopulateDot11fExtSuppRates( pMac, POPULATE_DOT11F_RATES_OPERATIONAL, &pFrm->ExtSuppRates, psessionEntry ); - //Populate HT IEs, when operating in 11n or Taurus modes. + //Populate HT IEs, when operating in 11n if ( psessionEntry->htCapability ) { PopulateDot11fHTCaps( pMac, psessionEntry, &pFrm->HTCaps ); @@ -1343,7 +1343,7 @@ limSendAssocRspMgmtFrame(tpAniSirGlobal pMac, tANI_U8 *pFrame, *macAddr; tpSirMacMgmtHdr pMacHdr; tSirRetStatus nSirStatus; - tANI_U8 lleMode = 0, fAddTS, edcaInclude = 0; + tANI_U8 lleMode = 0, fAddTS; tHalBitVal qosMode, wmeMode; tANI_U32 nPayload, nBytes, nStatus; void *pPacket; @@ -1416,37 +1416,18 @@ limSendAssocRspMgmtFrame(tpAniSirGlobal pMac, if ( pSta->lleEnabled ) { lleMode = 1; - if ( ( ! pSta->aniPeer ) || ( ! PROP_CAPABILITY_GET( 11EQOS, pSta->propCapability ) ) ) - { - PopulateDot11fEDCAParamSet( pMac, &frm.EDCAParamSet, psessionEntry); - } + PopulateDot11fEDCAParamSet( pMac, &frm.EDCAParamSet, psessionEntry); } // End if on .11e enabled in 'pSta'. } // End if on QOS Mode on. - if ( ( ! lleMode ) && ( eHAL_SET == wmeMode ) && pSta->wmeEnabled ) - { - if ( ( ! pSta->aniPeer ) || ( ! PROP_CAPABILITY_GET( WME, pSta->propCapability ) ) ) - { - - PopulateDot11fWMMParams( pMac, &frm.WMMParams, psessionEntry); + if ((!lleMode) && (eHAL_SET == wmeMode) && pSta->wmeEnabled) { + PopulateDot11fWMMParams(pMac, &frm.WMMParams, psessionEntry); - if ( pSta->wsmEnabled ) - { - PopulateDot11fWMMCaps(&frm.WMMCaps ); - } + if (pSta->wsmEnabled) { + PopulateDot11fWMMCaps(&frm.WMMCaps); } } - if ( pSta->aniPeer ) - { - if ( ( lleMode && PROP_CAPABILITY_GET( 11EQOS, pSta->propCapability ) ) || - ( pSta->wmeEnabled && PROP_CAPABILITY_GET( WME, pSta->propCapability ) ) ) - { - edcaInclude = 1; - } - - } // End if on Airgo peer. - if ( pSta->mlmStaContext.htCapability && psessionEntry->htCapability ) { @@ -2206,8 +2187,6 @@ limSendAssocReqMgmtFrame(tpAniSirGlobal pMac, } caps = pMlmAssocReq->capabilityInfo; - if ( PROP_CAPABILITY_GET( 11EQOS, psessionEntry->limCurrentBssPropCap ) ) - ((tSirMacCapabilityInfo *) &caps)->qos = 0; #if defined(FEATURE_WLAN_WAPI) /* CR: 262463 : According to WAPI standard: @@ -2261,8 +2240,7 @@ limSendAssocReqMgmtFrame(tpAniSirGlobal pMac, } #endif - if ( fQosEnabled && - ( ! PROP_CAPABILITY_GET(11EQOS, psessionEntry->limCurrentBssPropCap))) + if (fQosEnabled) PopulateDot11fQOSCapsStation( pMac, &pFrm->QOSCapsStation ); PopulateDot11fExtSuppRates( pMac, POPULATE_DOT11F_RATES_OPERATIONAL, @@ -2312,30 +2290,22 @@ limSendAssocReqMgmtFrame(tpAniSirGlobal pMac, } // include WME EDCA IE as well - if ( fWmeEnabled ) - { - if ( ! PROP_CAPABILITY_GET( WME, psessionEntry->limCurrentBssPropCap ) ) - { - if(!pMac->psOffloadEnabled) - PopulateDot11fWMMInfoStation( pMac, &pFrm->WMMInfoStation ); - else - PopulateDot11fWMMInfoStationPerSession(pMac, psessionEntry, - &pFrm->WMMInfoStation); - } + if (fWmeEnabled) { + if(!pMac->psOffloadEnabled) + PopulateDot11fWMMInfoStation( pMac, &pFrm->WMMInfoStation ); + else + PopulateDot11fWMMInfoStationPerSession(pMac, psessionEntry, + &pFrm->WMMInfoStation); - if ( fWsmEnabled && - ( ! PROP_CAPABILITY_GET(WSM, psessionEntry->limCurrentBssPropCap ))) - { + if (fWsmEnabled) PopulateDot11fWMMCaps( &pFrm->WMMCaps ); - } } - //Populate HT IEs, when operating in 11n or Taurus modes AND - //when AP is also operating in 11n mode. - if ( psessionEntry->htCapability && - pMac->lim.htCapabilityPresentInBeacon) - { - PopulateDot11fHTCaps( pMac, psessionEntry, &pFrm->HTCaps ); + /* Populate HT IEs, when operating in 11n and + * when AP is also operating in 11n mode */ + if (psessionEntry->htCapability && + pMac->lim.htCapabilityPresentInBeacon) { + PopulateDot11fHTCaps(pMac, psessionEntry, &pFrm->HTCaps); #ifdef DISABLE_GF_FOR_INTEROP /* @@ -2610,8 +2580,6 @@ limSendReassocReqWithFTIEsMgmtFrame(tpAniSirGlobal pMac, vos_mem_set( ( tANI_U8* )&frm, sizeof( frm ), 0 ); caps = pMlmReassocReq->capabilityInfo; - if (PROP_CAPABILITY_GET(11EQOS, psessionEntry->limReassocBssPropCap)) - ((tSirMacCapabilityInfo *) &caps)->qos = 0; #if defined(FEATURE_WLAN_WAPI) /* CR: 262463 : According to WAPI standard: @@ -2672,11 +2640,8 @@ limSendReassocReqWithFTIEsMgmtFrame(tpAniSirGlobal pMac, } #endif - if ( fQosEnabled && - ( ! PROP_CAPABILITY_GET(11EQOS, psessionEntry->limReassocBssPropCap ) )) - { + if (fQosEnabled) PopulateDot11fQOSCapsStation( pMac, &frm.QOSCapsStation ); - } PopulateDot11fExtSuppRates( pMac, POPULATE_DOT11F_RATES_OPERATIONAL, &frm.ExtSuppRates, psessionEntry ); @@ -2760,20 +2725,14 @@ limSendReassocReqWithFTIEsMgmtFrame(tpAniSirGlobal pMac, // include WME EDCA IE as well if ( fWmeEnabled ) { - if ( ! PROP_CAPABILITY_GET( WME, psessionEntry->limReassocBssPropCap ) ) - { - if(!pMac->psOffloadEnabled) - PopulateDot11fWMMInfoStation( pMac, &frm.WMMInfoStation ); - else - PopulateDot11fWMMInfoStationPerSession(pMac, psessionEntry, - &frm.WMMInfoStation); - } + if(!pMac->psOffloadEnabled) + PopulateDot11fWMMInfoStation( pMac, &frm.WMMInfoStation ); + else + PopulateDot11fWMMInfoStationPerSession(pMac, psessionEntry, + &frm.WMMInfoStation); - if ( fWsmEnabled && - ( ! PROP_CAPABILITY_GET(WSM, psessionEntry->limReassocBssPropCap ))) - { + if (fWsmEnabled) PopulateDot11fWMMCaps( &frm.WMMCaps ); - } #ifdef FEATURE_WLAN_ESE if (psessionEntry->isESEconnection) { @@ -3117,8 +3076,6 @@ limSendReassocReqMgmtFrame(tpAniSirGlobal pMac, vos_mem_set( ( tANI_U8* )&frm, sizeof( frm ), 0 ); caps = pMlmReassocReq->capabilityInfo; - if (PROP_CAPABILITY_GET(11EQOS, psessionEntry->limReassocBssPropCap)) - ((tSirMacCapabilityInfo *) &caps)->qos = 0; #if defined(FEATURE_WLAN_WAPI) /* CR: 262463 : According to WAPI standard: @@ -3172,11 +3129,8 @@ limSendReassocReqMgmtFrame(tpAniSirGlobal pMac, } #endif - if ( fQosEnabled && - ( ! PROP_CAPABILITY_GET(11EQOS, psessionEntry->limReassocBssPropCap ) )) - { + if (fQosEnabled) PopulateDot11fQOSCapsStation( pMac, &frm.QOSCapsStation ); - } PopulateDot11fExtSuppRates( pMac, POPULATE_DOT11F_RATES_OPERATIONAL, &frm.ExtSuppRates, psessionEntry ); @@ -3225,22 +3179,15 @@ limSendReassocReqMgmtFrame(tpAniSirGlobal pMac, } // include WME EDCA IE as well - if ( fWmeEnabled ) - { - if ( ! PROP_CAPABILITY_GET( WME, psessionEntry->limReassocBssPropCap ) ) - { - if(!pMac->psOffloadEnabled) - PopulateDot11fWMMInfoStation( pMac, &frm.WMMInfoStation ); - else - PopulateDot11fWMMInfoStationPerSession(pMac, psessionEntry, - &frm.WMMInfoStation); - } + if (fWmeEnabled) { + if(!pMac->psOffloadEnabled) + PopulateDot11fWMMInfoStation( pMac, &frm.WMMInfoStation ); + else + PopulateDot11fWMMInfoStationPerSession(pMac, psessionEntry, + &frm.WMMInfoStation); - if ( fWsmEnabled && - ( ! PROP_CAPABILITY_GET(WSM, psessionEntry->limReassocBssPropCap ))) - { - PopulateDot11fWMMCaps( &frm.WMMCaps ); - } + if (fWsmEnabled) + PopulateDot11fWMMCaps(&frm.WMMCaps); } if ( psessionEntry->htCapability && diff --git a/CORE/MAC/src/pe/lim/limSendMessages.c b/CORE/MAC/src/pe/lim/limSendMessages.c index 834d15f14af5..4aaa274c3769 100644 --- a/CORE/MAC/src/pe/lim/limSendMessages.c +++ b/CORE/MAC/src/pe/lim/limSendMessages.c @@ -312,11 +312,11 @@ returnFailure: * @param pMac pointer to Global Mac structure. * @param tpUpdatedEdcaParams pointer to the structure which contains * dynamically changing EDCA parameters. - * @param highPerformance If the peer is Airgo (taurus) then switch to highPerformance is true. - * * @return success if message send is ok, else false. */ -tSirRetStatus limSendEdcaParams(tpAniSirGlobal pMac, tSirMacEdcaParamRecord *pUpdatedEdcaParams, tANI_U16 bssIdx, tANI_BOOLEAN highPerformance) +tSirRetStatus limSendEdcaParams(tpAniSirGlobal pMac, + tSirMacEdcaParamRecord *pUpdatedEdcaParams, + tANI_U16 bssIdx) { tEdcaParams *pEdcaParams = NULL; tSirRetStatus retCode = eSIR_SUCCESS; @@ -335,7 +335,6 @@ tSirRetStatus limSendEdcaParams(tpAniSirGlobal pMac, tSirMacEdcaParamRecord *pUp pEdcaParams->acbk = pUpdatedEdcaParams[EDCA_AC_BK]; pEdcaParams->acvi = pUpdatedEdcaParams[EDCA_AC_VI]; pEdcaParams->acvo = pUpdatedEdcaParams[EDCA_AC_VO]; - pEdcaParams->highPerformance = highPerformance; msgQ.type = WDA_UPDATE_EDCA_PROFILE_IND; msgQ.reserved = 0; msgQ.bodyptr = pEdcaParams; diff --git a/CORE/MAC/src/pe/lim/limSendMessages.h b/CORE/MAC/src/pe/lim/limSendMessages.h index 5258cae97bbd..534088b1098b 100644 --- a/CORE/MAC/src/pe/lim/limSendMessages.h +++ b/CORE/MAC/src/pe/lim/limSendMessages.h @@ -78,7 +78,9 @@ tSirRetStatus limSendSwitchChnlParams(tpAniSirGlobal pMac, tANI_U8 chnlNumber, ePhyChanBondState secondaryChnlOffset, tANI_U8 localPwrConstraint,tANI_U8 peSessionId); #endif -tSirRetStatus limSendEdcaParams(tpAniSirGlobal pMac, tSirMacEdcaParamRecord *pUpdatedEdcaParams, tANI_U16 bssIdx, tANI_BOOLEAN highPerformance); +tSirRetStatus limSendEdcaParams(tpAniSirGlobal pMac, + tSirMacEdcaParamRecord *pUpdatedEdcaParams, + tANI_U16 bssIdx); tSirRetStatus limSetLinkState(tpAniSirGlobal pMac, tSirLinkState state, tSirMacAddr bssId, tSirMacAddr selfMac, tpSetLinkStateCallback callback, void *callbackArg); diff --git a/CORE/MAC/src/pe/lim/limSerDesUtils.c b/CORE/MAC/src/pe/lim/limSerDesUtils.c index d098a67a0d32..2c1d883cf0d3 100644 --- a/CORE/MAC/src/pe/lim/limSerDesUtils.c +++ b/CORE/MAC/src/pe/lim/limSerDesUtils.c @@ -1356,14 +1356,6 @@ limJoinReqSerDes(tpAniSirGlobal pMac, tpSirSmeJoinReq pJoinReq, tANI_U8 *pBuf) len -= sizeof(tAniBool); if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE) return eSIR_FAILURE; - // Extract Titan CB Neighbor BSS info - pJoinReq->cbNeighbors.cbBssFoundPri = *pBuf; - pBuf++; - pJoinReq->cbNeighbors.cbBssFoundSecUp = *pBuf; - pBuf++; - pJoinReq->cbNeighbors.cbBssFoundSecDown = *pBuf; - pBuf++; - len -= 3; // Extract Spectrum Mgt Indicator pJoinReq->spectrumMgtIndicator = (tAniBool) limGetU32(pBuf); diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c index 155269ea72b7..5d566d05002e 100644 --- a/CORE/MAC/src/pe/lim/limUtils.c +++ b/CORE/MAC/src/pe/lim/limUtils.c @@ -457,40 +457,6 @@ char* limDot11ModeStr(tpAniSirGlobal pMac, tANI_U8 dot11Mode) return "11G"; case WNI_CFG_DOT11_MODE_11N: return "11N"; - case WNI_CFG_DOT11_MODE_POLARIS: - return "Polaris"; - case WNI_CFG_DOT11_MODE_TITAN: - return "Titan"; - case WNI_CFG_DOT11_MODE_TAURUS: - return "Taurus"; - default: - return "Invalid Dot11 Mode"; - } -#endif -return ""; -} - - -char* limStaOpRateModeStr(tStaRateMode opRateMode) -{ -#ifdef FIXME_GEN6 - - switch(opRateMode) - { - case eSTA_TAURUS: - return "Taurus"; - case eSTA_11a: - return "11A"; - case eSTA_11b: - return "11B"; - case eSTA_11bg: - return "11G"; - case eSTA_11n: - return "11N"; - case eSTA_POLARIS: - return "Polaris"; - case eSTA_TITAN: - return "Titan"; default: return "Invalid Dot11 Mode"; } @@ -878,8 +844,6 @@ char *limResultCodeStr(tSirResultCodes resultCode) return "eSIR_SME_LINK_TEST_INVALID_STATE"; case eSIR_SME_LINK_TEST_INVALID_ADDRESS: return "eSIR_SME_LINK_TEST_INVALID_ADDRESS"; - case eSIR_SME_POLARIS_RESET: - return "eSIR_SME_POLARIS_RESET"; case eSIR_SME_SETCONTEXT_FAILED: return "eSIR_SME_SETCONTEXT_FAILED"; case eSIR_SME_BSS_RESTART: @@ -2747,11 +2711,10 @@ void limProcessChannelSwitchTimeout(tpAniSirGlobal pMac) * @param psessionentry */ void -limUpdateChannelSwitch(struct sAniSirGlobal *pMac, tpSirProbeRespBeacon pBeacon, tpPESession psessionEntry) +limUpdateChannelSwitch(struct sAniSirGlobal *pMac, tpSirProbeRespBeacon pBeacon, + tpPESession psessionEntry) { - tANI_U16 beaconPeriod; - tChannelSwitchPropIEStruct *pPropChnlSwitch; tDot11fIEChanSwitchAnn *pChnlSwitch; #ifdef WLAN_FEATURE_11AC tDot11fIEWiderBWChanSwitchAnn *pWiderChnlSwitch; @@ -2759,89 +2722,75 @@ limUpdateChannelSwitch(struct sAniSirGlobal *pMac, tpSirProbeRespBeacon pBeacon beaconPeriod = psessionEntry->beaconParams.beaconInterval; - /* STA either received proprietary channel switch IE or 802.11h - * standard channel switch IE. - */ - if (pBeacon->propIEinfo.propChannelSwitchPresent) - { - pPropChnlSwitch = &(pBeacon->propIEinfo.channelSwitch); - - /* Add logic to determine which change this is: */ - /* primary, secondary, both. For now assume both. */ - psessionEntry->gLimChannelSwitch.state = eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY; - psessionEntry->gLimChannelSwitch.primaryChannel = pPropChnlSwitch->primaryChannel; - psessionEntry->gLimChannelSwitch.secondarySubBand = (ePhyChanBondState)pPropChnlSwitch->subBand; - psessionEntry->gLimChannelSwitch.switchCount = pPropChnlSwitch->channelSwitchCount; - psessionEntry->gLimChannelSwitch.switchTimeoutValue = - SYS_MS_TO_TICKS(beaconPeriod)* (pPropChnlSwitch->channelSwitchCount); - psessionEntry->gLimChannelSwitch.switchMode = pPropChnlSwitch->mode; - } - else - { - pChnlSwitch = &(pBeacon->channelSwitchIE); - psessionEntry->gLimChannelSwitch.primaryChannel = pChnlSwitch->newChannel; - psessionEntry->gLimChannelSwitch.switchCount = pChnlSwitch->switchCount; - psessionEntry->gLimChannelSwitch.switchTimeoutValue = - SYS_MS_TO_TICKS(beaconPeriod)* (pChnlSwitch->switchCount); - psessionEntry->gLimChannelSwitch.switchMode = pChnlSwitch->switchMode; + /* 802.11h standard channel switch IE */ + pChnlSwitch = &(pBeacon->channelSwitchIE); + psessionEntry->gLimChannelSwitch.primaryChannel = pChnlSwitch->newChannel; + psessionEntry->gLimChannelSwitch.switchCount = pChnlSwitch->switchCount; + psessionEntry->gLimChannelSwitch.switchTimeoutValue = + SYS_MS_TO_TICKS(beaconPeriod)* (pChnlSwitch->switchCount); + psessionEntry->gLimChannelSwitch.switchMode = pChnlSwitch->switchMode; #ifdef WLAN_FEATURE_11AC - pWiderChnlSwitch = &(pBeacon->WiderBWChanSwitchAnn); - if(pBeacon->WiderBWChanSwitchAnnPresent) - { - psessionEntry->gLimWiderBWChannelSwitch.newChanWidth = pWiderChnlSwitch->newChanWidth; - psessionEntry->gLimWiderBWChannelSwitch.newCenterChanFreq0 = pWiderChnlSwitch->newCenterChanFreq0; - psessionEntry->gLimWiderBWChannelSwitch.newCenterChanFreq1 = pWiderChnlSwitch->newCenterChanFreq1; - } + pWiderChnlSwitch = &(pBeacon->WiderBWChanSwitchAnn); + if (pBeacon->WiderBWChanSwitchAnnPresent) { + psessionEntry->gLimWiderBWChannelSwitch.newChanWidth = + pWiderChnlSwitch->newChanWidth; + psessionEntry->gLimWiderBWChannelSwitch.newCenterChanFreq0 = + pWiderChnlSwitch->newCenterChanFreq0; + psessionEntry->gLimWiderBWChannelSwitch.newCenterChanFreq1 = + pWiderChnlSwitch->newCenterChanFreq1; + } #endif - /* Only primary channel switch element is present */ - psessionEntry->gLimChannelSwitch.state = eLIM_CHANNEL_SWITCH_PRIMARY_ONLY; - psessionEntry->gLimChannelSwitch.secondarySubBand = PHY_SINGLE_CHANNEL_CENTERED; - - /* Do not bother to look and operate on extended channel switch element - * if our own channel-bonding state is not enabled - */ - if (psessionEntry->htSupportedChannelWidthSet) - { - if (pBeacon->extChannelSwitchPresent) - { - if ((pBeacon->extChannelSwitchIE.secondaryChannelOffset == PHY_DOUBLE_CHANNEL_LOW_PRIMARY) || - (pBeacon->extChannelSwitchIE.secondaryChannelOffset == PHY_DOUBLE_CHANNEL_HIGH_PRIMARY)) - { - psessionEntry->gLimChannelSwitch.state = eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY; - psessionEntry->gLimChannelSwitch.secondarySubBand = pBeacon->extChannelSwitchIE.secondaryChannelOffset; - } + /* Only primary channel switch element is present */ + psessionEntry->gLimChannelSwitch.state = eLIM_CHANNEL_SWITCH_PRIMARY_ONLY; + psessionEntry->gLimChannelSwitch.secondarySubBand = + PHY_SINGLE_CHANNEL_CENTERED; + + /* Do not bother to look and operate on extended channel switch element + * if our own channel-bonding state is not enabled + */ + if (psessionEntry->htSupportedChannelWidthSet) { + if (pBeacon->extChannelSwitchPresent) { + if ((pBeacon->extChannelSwitchIE.secondaryChannelOffset == + PHY_DOUBLE_CHANNEL_LOW_PRIMARY) || + (pBeacon->extChannelSwitchIE.secondaryChannelOffset == + PHY_DOUBLE_CHANNEL_HIGH_PRIMARY)) { + psessionEntry->gLimChannelSwitch.state = + eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY; + psessionEntry->gLimChannelSwitch.secondarySubBand = + pBeacon->extChannelSwitchIE.secondaryChannelOffset; + } #ifdef WLAN_FEATURE_11AC - if(psessionEntry->vhtCapability && pBeacon->WiderBWChanSwitchAnnPresent) - { - if (pWiderChnlSwitch->newChanWidth == WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ) - { - if(pBeacon->extChannelSwitchPresent) - { - if ((pBeacon->extChannelSwitchIE.secondaryChannelOffset == PHY_DOUBLE_CHANNEL_LOW_PRIMARY) || - (pBeacon->extChannelSwitchIE.secondaryChannelOffset == PHY_DOUBLE_CHANNEL_HIGH_PRIMARY)) - { - psessionEntry->gLimChannelSwitch.state = eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY; - psessionEntry->gLimChannelSwitch.secondarySubBand = limGet11ACPhyCBState(pMac, - psessionEntry->gLimChannelSwitch.primaryChannel, - pBeacon->extChannelSwitchIE.secondaryChannelOffset, - pWiderChnlSwitch->newCenterChanFreq0, - psessionEntry); - } - } - } - } + if (psessionEntry->vhtCapability && + pBeacon->WiderBWChanSwitchAnnPresent) { + if (pWiderChnlSwitch->newChanWidth == + WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ) { + if (pBeacon->extChannelSwitchPresent) { + if ((pBeacon->extChannelSwitchIE.secondaryChannelOffset == + PHY_DOUBLE_CHANNEL_LOW_PRIMARY) || + (pBeacon->extChannelSwitchIE.secondaryChannelOffset == + PHY_DOUBLE_CHANNEL_HIGH_PRIMARY)) { + psessionEntry->gLimChannelSwitch.state = + eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY; + psessionEntry->gLimChannelSwitch.secondarySubBand = + limGet11ACPhyCBState(pMac, + psessionEntry->gLimChannelSwitch.primaryChannel, + pBeacon->extChannelSwitchIE.secondaryChannelOffset, + pWiderChnlSwitch->newCenterChanFreq0, + psessionEntry); + } + } + } + } #endif - } - } - } - if (eSIR_SUCCESS != limStartChannelSwitch(pMac, psessionEntry)) - { + } + } + if (eSIR_SUCCESS != limStartChannelSwitch(pMac, psessionEntry)) { PELOGW(limLog(pMac, LOGW, FL("Could not start Channel Switch"));) } limLog(pMac, LOGW, - FL("session %d primary chl %d, subband %d, count %d (%d ticks) "), + FL("session %d primary chl %d, subband %d, count %d (%d ticks)"), psessionEntry->peSessionId, psessionEntry->gLimChannelSwitch.primaryChannel, psessionEntry->gLimChannelSwitch.secondarySubBand, @@ -3058,8 +3007,7 @@ void limProcessQuietTimeout(tpAniSirGlobal pMac) * If 802.11H is enabled, the Quiet BSS IE is sent as per * the 11H spec * If 802.11H is not enabled, the Quiet BSS IE is sent as - * a Proprietary IE. This will be understood by all the - * TITAN STA's + * a Proprietary IE. * Transitioning gLimQuietState to eLIM_QUIET_BEGIN will * initiate the SCH to include the Quiet BSS IE in all * its subsequent Beacons/PR's. @@ -3218,7 +3166,7 @@ limUtilCountStaAdd( tpPESession psessionEntry) { - if ((! pSta) || (! pSta->valid) || (! pSta->aniPeer) || (pSta->fAniCount)) + if ((! pSta) || (! pSta->valid) || (pSta->fAniCount)) return; pSta->fAniCount = 1; @@ -3237,7 +3185,7 @@ limUtilCountStaDel( tpPESession psessionEntry) { - if ((pSta == NULL) || (pSta->aniPeer == eHAL_CLEAR) || (! pSta->fAniCount)) + if ((pSta == NULL) || (! pSta->fAniCount)) return; /* Only if sta is invalid and the validInDummyState bit is set to 1, @@ -5925,12 +5873,6 @@ tSirRetStatus limPostMlmAddBAReq( tpAniSirGlobal pMac, tpDialogueToken dialogueTokenNode; tANI_U32 val = 0; - // Check if the peer is a 11n capable STA - // FIXME - Need a 11n peer indication in DPH. - // For now, using the taurusPeer attribute - //if( 0 == pStaDs->taurusPeer == ) - //return eSIR_SUCCESS; - // Allocate for LIM_MLM_ADDBA_REQ pMlmAddBAReq = vos_mem_malloc(sizeof( tLimMlmAddBAReq )); if ( NULL == pMlmAddBAReq ) @@ -6494,7 +6436,7 @@ void limPktFree ( * limGetBDfromRxPacket() * *FUNCTION: - * This function is called to get pointer to Polaris + * This function is called to get pointer to * Buffer Descriptor containing MAC header & other control * info from the body of the message posted to LIM. * @@ -7924,7 +7866,6 @@ void limGetShortSlotFromPhyMode(tpAniSirGlobal pMac, tpPESession psessionEntry, { val = true; } - // Program Polaris based on AP capability if (psessionEntry->limMlmState == eLIM_MLM_WT_JOIN_BEACON_STATE) { // Joining BSS. diff --git a/CORE/MAC/src/pe/lim/limUtils.h b/CORE/MAC/src/pe/lim/limUtils.h index 881d589808fc..94b821e9fd7a 100644 --- a/CORE/MAC/src/pe/lim/limUtils.h +++ b/CORE/MAC/src/pe/lim/limUtils.h @@ -110,7 +110,6 @@ char * limSmeStateStr(tLimSmeStates state); char * limMsgStr(tANI_U32 msgType); char * limResultCodeStr(tSirResultCodes resultCode); char* limDot11ModeStr(tpAniSirGlobal pMac, tANI_U8 dot11Mode); -char* limStaOpRateModeStr(tStaRateMode opRateMode); void limPrintMlmState(tpAniSirGlobal pMac, tANI_U16 logLevel, tLimMlmStates state); void limPrintSmeState(tpAniSirGlobal pMac, tANI_U16 logLevel, tLimSmeStates state); void limPrintMsgName(tpAniSirGlobal pMac, tANI_U16 logLevel, tANI_U32 msgType); diff --git a/CORE/MAC/src/pe/sch/schBeaconGen.c b/CORE/MAC/src/pe/sch/schBeaconGen.c index 12d2ea834676..78e074f93d7b 100644 --- a/CORE/MAC/src/pe/sch/schBeaconGen.c +++ b/CORE/MAC/src/pe/sch/schBeaconGen.c @@ -334,12 +334,6 @@ tSirRetStatus schSetFixedBeaconFields(tpAniSirGlobal pMac,tpPESession psessionEn */ PopulateDot11fChanSwitchAnn(pMac, &pBcn2->ChanSwitchAnn, psessionEntry); - - /* TODO: depending the CB mode, extended channel switch announcement - * need to be called - */ - /*PopulateDot11fExtChanSwitchAnn(pMac, &pBcn2->ExtChanSwitchAnn, - psessionEntry);*/ #ifdef WLAN_FEATURE_11AC /* TODO: If in 11AC mode, wider bw channel switch announcement needs * to be called diff --git a/CORE/MAC/src/pe/sch/schBeaconProcess.c b/CORE/MAC/src/pe/sch/schBeaconProcess.c index 9f1a9dee337d..083ecaf02f56 100644 --- a/CORE/MAC/src/pe/sch/schBeaconProcess.c +++ b/CORE/MAC/src/pe/sch/schBeaconProcess.c @@ -442,10 +442,8 @@ static void __schBeaconProcessForSession( tpAniSirGlobal pMac, // If needed, downgrade the EDCA parameters limSetActiveEdcaParams(pMac, psessionEntry->gLimEdcaParams, psessionEntry); - if (pStaDs->aniPeer == eANI_BOOLEAN_TRUE) - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_TRUE); - else - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, pStaDs->bssId, eANI_BOOLEAN_FALSE); + limSendEdcaParams(pMac, psessionEntry->gLimEdcaParamsActive, + pStaDs->bssId); } else PELOGE(schLog(pMac, LOGE, FL("Self Entry missing in Hash Table"));) @@ -465,13 +463,10 @@ static void __schBeaconProcessForSession( tpAniSirGlobal pMac, (psessionEntry->limSystemRole == eLIM_STA_IN_IBSS_ROLE) ) { /* Channel Switch information element updated */ - if(pBeacon->channelSwitchPresent || - pBeacon->propIEinfo.propChannelSwitchPresent) - { + if (pBeacon->channelSwitchPresent) { limUpdateChannelSwitch(pMac, pBeacon, psessionEntry); - } - else if (psessionEntry->gLimSpecMgmt.dot11hChanSwState == eLIM_11H_CHANSW_RUNNING) - { + } else if (psessionEntry->gLimSpecMgmt.dot11hChanSwState == + eLIM_11H_CHANSW_RUNNING) { limCancelDot11hChannelSwitch(pMac, psessionEntry); } } diff --git a/CORE/MAC/src/pe/sch/schMessage.c b/CORE/MAC/src/pe/sch/schMessage.c index 359b7a31d2a1..d6b22e57f561 100644 --- a/CORE/MAC/src/pe/sch/schMessage.c +++ b/CORE/MAC/src/pe/sch/schMessage.c @@ -263,14 +263,10 @@ schGetParams( WNI_CFG_EDCA_ANI_ACVI_LOCAL, WNI_CFG_EDCA_ANI_ACVO_LOCAL }; tANI_U32 wme_l[] = {WNI_CFG_EDCA_WME_ACBE_LOCAL, WNI_CFG_EDCA_WME_ACBK_LOCAL, WNI_CFG_EDCA_WME_ACVI_LOCAL, WNI_CFG_EDCA_WME_ACVO_LOCAL}; - tANI_U32 demo_l[] = {WNI_CFG_EDCA_TIT_DEMO_ACBE_LOCAL, WNI_CFG_EDCA_TIT_DEMO_ACBK_LOCAL, - WNI_CFG_EDCA_TIT_DEMO_ACVI_LOCAL, WNI_CFG_EDCA_TIT_DEMO_ACVO_LOCAL}; tANI_U32 ani_b[] = {WNI_CFG_EDCA_ANI_ACBE, WNI_CFG_EDCA_ANI_ACBK, WNI_CFG_EDCA_ANI_ACVI, WNI_CFG_EDCA_ANI_ACVO}; tANI_U32 wme_b[] = {WNI_CFG_EDCA_WME_ACBE, WNI_CFG_EDCA_WME_ACBK, WNI_CFG_EDCA_WME_ACVI, WNI_CFG_EDCA_WME_ACVO}; - tANI_U32 demo_b[] = {WNI_CFG_EDCA_TIT_DEMO_ACBE, WNI_CFG_EDCA_TIT_DEMO_ACBK, - WNI_CFG_EDCA_TIT_DEMO_ACVI, WNI_CFG_EDCA_TIT_DEMO_ACVO}; if (wlan_cfgGetInt(pMac, WNI_CFG_EDCA_PROFILE, &val) != eSIR_SUCCESS) { @@ -287,8 +283,7 @@ schGetParams( } schLog(pMac, LOGW, FL("EdcaProfile: Using %d (%s)"), val, - ((val == WNI_CFG_EDCA_PROFILE_WMM) ? "WMM" - : ( (val == WNI_CFG_EDCA_PROFILE_TIT_DEMO) ? "Titan" : "HiPerf"))); + ((val == WNI_CFG_EDCA_PROFILE_WMM) ? "WMM" : "HiPerf")); if (local) { @@ -297,9 +292,6 @@ schGetParams( case WNI_CFG_EDCA_PROFILE_WMM: prf = &wme_l[0]; break; - case WNI_CFG_EDCA_PROFILE_TIT_DEMO: - prf = &demo_l[0]; - break; case WNI_CFG_EDCA_PROFILE_ANI: default: prf = &ani_l[0]; @@ -313,9 +305,6 @@ schGetParams( case WNI_CFG_EDCA_PROFILE_WMM: prf = &wme_b[0]; break; - case WNI_CFG_EDCA_PROFILE_TIT_DEMO: - prf = &demo_b[0]; - break; case WNI_CFG_EDCA_PROFILE_ANI: default: prf = &ani_b[0]; @@ -453,7 +442,6 @@ schQosUpdateLocal(tpAniSirGlobal pMac, tpPESession psessionEntry) { tANI_U32 params[4][WNI_CFG_EDCA_ANI_ACBK_LOCAL_LEN]; - tANI_BOOLEAN highPerformance=eANI_BOOLEAN_TRUE; if (schGetParams(pMac, params, true /*local*/) != eSIR_SUCCESS) { @@ -463,20 +451,9 @@ schQosUpdateLocal(tpAniSirGlobal pMac, tpPESession psessionEntry) setSchEdcaParams(pMac, params, psessionEntry); - if (psessionEntry->limSystemRole == eLIM_AP_ROLE) - { - if (pMac->lim.gLimNumOfAniSTAs) - highPerformance = eANI_BOOLEAN_TRUE; - else - highPerformance = eANI_BOOLEAN_FALSE; - } - else if (psessionEntry->limSystemRole == eLIM_STA_IN_IBSS_ROLE) - { - highPerformance = eANI_BOOLEAN_TRUE; - } - //For AP, the bssID is stored in LIM Global context. - limSendEdcaParams(pMac, psessionEntry->gLimEdcaParams, psessionEntry->bssIdx, highPerformance); + limSendEdcaParams(pMac, psessionEntry->gLimEdcaParams, + psessionEntry->bssIdx); } /** ---------------------------------------------------------- diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h index ea41782be258..4f506ebd2ab6 100644 --- a/CORE/SME/inc/csrApi.h +++ b/CORE/SME/inc/csrApi.h @@ -124,26 +124,22 @@ typedef enum typedef enum { - eCSR_DOT11_MODE_TAURUS = 0, //This mean everything because it covers all thing we support eCSR_DOT11_MODE_abg = 0x0001, //11a/b/g only, no HT, no proprietary eCSR_DOT11_MODE_11a = 0x0002, eCSR_DOT11_MODE_11b = 0x0004, eCSR_DOT11_MODE_11g = 0x0008, eCSR_DOT11_MODE_11n = 0x0010, - eCSR_DOT11_MODE_POLARIS = 0x0020, - eCSR_DOT11_MODE_TITAN = 0x0040, - eCSR_DOT11_MODE_11g_ONLY = 0x0080, - eCSR_DOT11_MODE_11n_ONLY = 0x0100, - eCSR_DOT11_MODE_TAURUS_ONLY = 0x0200, - eCSR_DOT11_MODE_11b_ONLY = 0x0400, - eCSR_DOT11_MODE_11a_ONLY = 0x0800, + eCSR_DOT11_MODE_11g_ONLY = 0x0020, + eCSR_DOT11_MODE_11n_ONLY = 0x0040, + eCSR_DOT11_MODE_11b_ONLY = 0x0080, + eCSR_DOT11_MODE_11a_ONLY = 0x0100, #ifdef WLAN_FEATURE_11AC - eCSR_DOT11_MODE_11ac = 0x1000, - eCSR_DOT11_MODE_11ac_ONLY = 0x2000, + eCSR_DOT11_MODE_11ac = 0x0200, + eCSR_DOT11_MODE_11ac_ONLY = 0x0400, #endif //This is for WIFI test. It is same as eWNIAPI_MAC_PROTOCOL_ALL except when it starts IBSS in 11B of 2.4GHz //It is for CSR internal use - eCSR_DOT11_MODE_AUTO = 0x4000, + eCSR_DOT11_MODE_AUTO = 0x0800, eCSR_NUM_PHY_MODE = 16, //specify the number of maximum bits for phyMode }eCsrPhyMode; diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h index e0ec9647d539..1a8bbc5dcaaf 100644 --- a/CORE/SME/inc/csrInternal.h +++ b/CORE/SME/inc/csrInternal.h @@ -109,15 +109,11 @@ typedef enum { - //eCSR_CFG_DOT11_MODE_BEST = 0, - eCSR_CFG_DOT11_MODE_TAURUS = 0, eCSR_CFG_DOT11_MODE_ABG, eCSR_CFG_DOT11_MODE_11A, eCSR_CFG_DOT11_MODE_11B, eCSR_CFG_DOT11_MODE_11G, eCSR_CFG_DOT11_MODE_11N, - eCSR_CFG_DOT11_MODE_POLARIS, - eCSR_CFG_DOT11_MODE_TITAN, #ifdef WLAN_FEATURE_11AC eCSR_CFG_DOT11_MODE_11AC, #endif @@ -1106,12 +1102,10 @@ typedef struct tagCsrRoamStruct #define CSR_IS_PHY_MODE_DUAL_BAND(phyMode) \ ((eCSR_DOT11_MODE_abg & (phyMode)) || (eCSR_DOT11_MODE_11n & (phyMode)) || \ (eCSR_DOT11_MODE_11ac & (phyMode)) || \ - (eCSR_DOT11_MODE_TAURUS & (phyMode)) || \ (eCSR_DOT11_MODE_AUTO & (phyMode))) #else #define CSR_IS_PHY_MODE_DUAL_BAND(phyMode) \ ((eCSR_DOT11_MODE_abg & (phyMode)) || (eCSR_DOT11_MODE_11n & (phyMode)) || \ - (eCSR_DOT11_MODE_TAURUS & (phyMode)) || \ (eCSR_DOT11_MODE_AUTO & (phyMode))) #endif diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index 993f3b412f0a..836570cda011 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -1061,9 +1061,9 @@ static void initConfigParam(tpAniSirGlobal pMac) pMac->roam.configParam.channelBondingMode24GHz = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE; pMac->roam.configParam.channelBondingMode5GHz = WNI_CFG_CHANNEL_BONDING_MODE_ENABLE; - pMac->roam.configParam.phyMode = eCSR_DOT11_MODE_TAURUS; + pMac->roam.configParam.phyMode = eCSR_DOT11_MODE_AUTO; pMac->roam.configParam.eBand = eCSR_BAND_ALL; - pMac->roam.configParam.uCfgDot11Mode = eCSR_CFG_DOT11_MODE_TAURUS; + pMac->roam.configParam.uCfgDot11Mode = eCSR_CFG_DOT11_MODE_AUTO; pMac->roam.configParam.FragmentationThreshold = eCSR_DOT11_FRAG_THRESH_DEFAULT; pMac->roam.configParam.HeartbeatThresh24 = 40; pMac->roam.configParam.HeartbeatThresh50 = 40; @@ -2076,16 +2076,9 @@ eHalStatus csrSetPhyMode(tHalHandle hHal, tANI_U32 phyMode, eCsrBand eBand, tANI break; } } - if((0 == phyMode) || (eCSR_DOT11_MODE_TAURUS & phyMode)) - { - newPhyMode = eCSR_DOT11_MODE_TAURUS; - } - else if(eCSR_DOT11_MODE_AUTO & phyMode) - { + if (eCSR_DOT11_MODE_AUTO & phyMode) { newPhyMode = eCSR_DOT11_MODE_AUTO; - } - else - { + } else { //Check for dual band and higher capability first if(eCSR_DOT11_MODE_11n_ONLY & phyMode) { @@ -3318,11 +3311,10 @@ static eHalStatus csrRoamPrepareBssConfigFromProfile(tpAniSirGlobal pMac, tCsrRo } else { qAPisEnabled = TRUE; } - if (( eCsrRoamWmmNoQos != pMac->roam.configParam.WMMSupportMode && qAPisEnabled) || - (( eCSR_CFG_DOT11_MODE_11N == pBssConfig->uCfgDot11Mode && qAPisEnabled) || - ( eCSR_CFG_DOT11_MODE_TAURUS == pBssConfig->uCfgDot11Mode ) ) //For 11n, need QoS - ) - { + if ((eCsrRoamWmmNoQos != pMac->roam.configParam.WMMSupportMode && + qAPisEnabled) || + ((eCSR_CFG_DOT11_MODE_11N == pBssConfig->uCfgDot11Mode && + qAPisEnabled))) { pBssConfig->qosType = eCSR_MEDIUM_ACCESS_WMM_eDCF_DSCP; } else { pBssConfig->qosType = eCSR_MEDIUM_ACCESS_DCF; @@ -3681,7 +3673,6 @@ static eHalStatus csrGetRateSet( tpAniSirGlobal pMac, tCsrRoamProfile *pProfile } if ( eCSR_CFG_DOT11_MODE_11G == cfgDot11Mode || eCSR_CFG_DOT11_MODE_11N == cfgDot11Mode || - eCSR_CFG_DOT11_MODE_TAURUS == cfgDot11Mode || eCSR_CFG_DOT11_MODE_ABG == cfgDot11Mode #ifdef WLAN_FEATURE_11AC || eCSR_CFG_DOT11_MODE_11AC == cfgDot11Mode @@ -3726,9 +3717,6 @@ static void csrSetCfgRateSet( tpAniSirGlobal pMac, eCsrPhyMode phyMode, tCsrRoam tANI_U32 OperationalRatesLength = 0; tANI_U8 ExtendedOperationalRates[ CSR_DOT11_EXTENDED_SUPPORTED_RATES_MAX ]; // leave enough room for the max number of rates tANI_U32 ExtendedOperationalRatesLength = 0; - tANI_U8 ProprietaryOperationalRates[ 4 ]; // leave enough room for the max number of proprietary rates - tANI_U32 ProprietaryOperationalRatesLength = 0; - tANI_U32 PropRatesEnable = 0; tANI_U8 MCSRateIdxSet[ SIZE_OF_SUPPORTED_MCS_SET ]; tANI_U32 MCSRateLength = 0; VOS_ASSERT( pIes != NULL ); @@ -3757,11 +3745,9 @@ static void csrSetCfgRateSet( tpAniSirGlobal pMac, eCsrPhyMode phyMode, tCsrRoam } } } - if ( eCSR_CFG_DOT11_MODE_11G == cfgDot11Mode || - eCSR_CFG_DOT11_MODE_11N == cfgDot11Mode || - eCSR_CFG_DOT11_MODE_TAURUS == cfgDot11Mode || - eCSR_CFG_DOT11_MODE_ABG == cfgDot11Mode ) - { + if (eCSR_CFG_DOT11_MODE_11G == cfgDot11Mode || + eCSR_CFG_DOT11_MODE_11N == cfgDot11Mode || + eCSR_CFG_DOT11_MODE_ABG == cfgDot11Mode) { // If there are Extended Rates in the beacon, we will reflect those // extended rates that we support in out Extended Operational Rate // set: @@ -3779,35 +3765,6 @@ static void csrSetCfgRateSet( tpAniSirGlobal pMac, eCsrPhyMode phyMode, tCsrRoam } } } - // Enable proprietary MAC features if peer node is Airgo node and STA - // user wants to use them - if( pIes->Airgo.present && pMac->roam.configParam.ProprietaryRatesEnabled ) - { - PropRatesEnable = 1; - } - else - { - PropRatesEnable = 0; - } - // For ANI network companions, we need to populate the proprietary rate - // set with any proprietary rates we found in the beacon, only if user - // allows them... - if ( PropRatesEnable && pIes->Airgo.PropSuppRates.present && - ( pIes->Airgo.PropSuppRates.num_rates > 0 )) - { - ProprietaryOperationalRatesLength = pIes->Airgo.PropSuppRates.num_rates; - if ( ProprietaryOperationalRatesLength > sizeof(ProprietaryOperationalRates) ) - { - ProprietaryOperationalRatesLength = sizeof (ProprietaryOperationalRates); - } - vos_mem_copy(ProprietaryOperationalRates, - pIes->Airgo.PropSuppRates.rates, - ProprietaryOperationalRatesLength); - } - else { - // No proprietary modes... - ProprietaryOperationalRatesLength = 0; - } /* Get MCS Rate */ pDstRate = MCSRateIdxSet; if ( pIes->HTCaps.present ) @@ -3826,10 +3783,6 @@ static void csrSetCfgRateSet( tpAniSirGlobal pMac, eCsrPhyMode phyMode, tCsrRoam OperationalRatesLength, NULL, eANI_BOOLEAN_FALSE); ccmCfgSetStr(pMac, WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET, ExtendedOperationalRates, ExtendedOperationalRatesLength, NULL, eANI_BOOLEAN_FALSE); - ccmCfgSetStr(pMac, WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET, - ProprietaryOperationalRates, - ProprietaryOperationalRatesLength, NULL, eANI_BOOLEAN_FALSE); - ccmCfgSetInt(pMac, WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED, PropRatesEnable, NULL, eANI_BOOLEAN_FALSE); ccmCfgSetStr(pMac, WNI_CFG_CURRENT_MCS_SET, MCSRateIdxSet, MCSRateLength, NULL, eANI_BOOLEAN_FALSE); }//Parsing BSSDesc @@ -3974,7 +3927,6 @@ static void csrSetCfgRateSetFromProfile( tpAniSirGlobal pMac, ccmCfgSetStr(pMac, WNI_CFG_PROPRIETARY_OPERATIONAL_RATE_SET, ProprietaryOperationalRates, ProprietaryOperationalRatesLength, NULL, eANI_BOOLEAN_FALSE); - ccmCfgSetInt(pMac, WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED, PropRatesEnable, NULL, eANI_BOOLEAN_FALSE); } void csrRoamCcmCfgSetCallback(tHalHandle hHal, tANI_S32 result) { @@ -5538,15 +5490,6 @@ eCsrPhyMode csrRoamdot11modeToPhymode(tANI_U8 dot11mode) case WNI_CFG_DOT11_MODE_11N: phymode = eCSR_DOT11_MODE_11n; break; - case WNI_CFG_DOT11_MODE_POLARIS: - phymode = eCSR_DOT11_MODE_POLARIS; - break; - case WNI_CFG_DOT11_MODE_TITAN: - phymode = eCSR_DOT11_MODE_TITAN; - break; - case WNI_CFG_DOT11_MODE_TAURUS: - phymode = eCSR_DOT11_MODE_TAURUS; - break; case WNI_CFG_DOT11_MODE_11G_ONLY: phymode = eCSR_DOT11_MODE_11g_ONLY; break; @@ -5742,8 +5685,6 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman // this was causing issues in the 2c_wlan_wep WHQL test when the SetContext was issued after the link // indication. (Link Indication happens in the profFSMSetConnectedInfra call). // - // this reordering was done on titan_prod_usb branch and is being replicated here. - // if( CSR_IS_ENC_TYPE_STATIC( pProfile->negotiatedUCEncryptionType ) && !pProfile->bWPSAssociation) @@ -11663,22 +11604,21 @@ static eCsrCfgDot11Mode csrRoamGetPhyModeBandForBss( tpAniSirGlobal pMac, tCsrRo cfgDot11Mode = eCSR_CFG_DOT11_MODE_11B; } - /* In-case of WEP Security encryption type is coming as part of add key. - So while STart BSS dont have information */ - if( (!CSR_IS_11n_ALLOWED(pProfile->EncryptionType.encryptionType[0] ) || ((pProfile->privacy == 1) && (pProfile->EncryptionType.encryptionType[0] == eCSR_ENCRYPT_TYPE_NONE)) ) && + /* Incase of WEP Security encryption type is coming as part of add key. + So while Start BSS dont have information */ + if ((!CSR_IS_11n_ALLOWED(pProfile->EncryptionType.encryptionType[0]) || + ((pProfile->privacy == 1) && + (pProfile->EncryptionType.encryptionType[0] == + eCSR_ENCRYPT_TYPE_NONE))) && ((eCSR_CFG_DOT11_MODE_11N == cfgDot11Mode) || #ifdef WLAN_FEATURE_11AC - (eCSR_CFG_DOT11_MODE_11AC == cfgDot11Mode) || + (eCSR_CFG_DOT11_MODE_11AC == cfgDot11Mode) #endif - (eCSR_CFG_DOT11_MODE_TAURUS == cfgDot11Mode)) ) - { - //We cannot do 11n here - if ( CSR_IS_CHANNEL_24GHZ(operationChn) ) - { + )) { + /* We cannot do 11n here */ + if (CSR_IS_CHANNEL_24GHZ(operationChn)) { cfgDot11Mode = eCSR_CFG_DOT11_MODE_11G; - } - else - { + } else { cfgDot11Mode = eCSR_CFG_DOT11_MODE_11A; } } @@ -12146,14 +12086,11 @@ static void csrRoamGetBssStartParms( tpAniSirGlobal pMac, tCsrRoamProfile *pProf break; default: case eCSR_CFG_DOT11_MODE_11N: - case eCSR_CFG_DOT11_MODE_TAURUS: - //Because LIM only verifies it against 11a, 11b or 11g, set only 11g or 11a here - if(eCSR_BAND_24 == eBand) - { + /* Because LIM only verifies it against 11a, 11b or 11g, + set only 11g or 11a here */ + if (eCSR_BAND_24 == eBand) { nwType = eSIR_11G_NW_TYPE; - } - else - { + } else { nwType = eSIR_11A_NW_TYPE; } break; @@ -12987,7 +12924,7 @@ eHalStatus csrRoamRemoveConnectedBssFromScanCache(tpAniSirGlobal pMac, pScanFilter->bWPSAssociation = eANI_BOOLEAN_FALSE; pScanFilter->bOSENAssociation = eANI_BOOLEAN_FALSE; pScanFilter->countryCode[0] = 0; - pScanFilter->phyMode = eCSR_DOT11_MODE_TAURUS; + pScanFilter->phyMode = eCSR_DOT11_MODE_AUTO; csrLLLock(&pMac->scan.scanResultList); pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_NOLOCK ); while( pEntry ) @@ -13134,10 +13071,6 @@ static void csrPrepareJoinReassocReqBuffer( tpAniSirGlobal pMac, tANI_U32 size = 0; tANI_S8 pwrLimit = 0; tANI_U16 i; - // plug in neighborhood occupancy info (i.e. BSSes on primary or secondary channels) - *pBuf++ = (tANI_U8)FALSE; //tAniTitanCBNeighborInfo->cbBssFoundPri - *pBuf++ = (tANI_U8)FALSE; //tAniTitanCBNeighborInfo->cbBssFoundSecDown - *pBuf++ = (tANI_U8)FALSE; //tAniTitanCBNeighborInfo->cbBssFoundSecUp // 802.11h //We can do this because it is in HOST CPU order for now. pAP_capabilityInfo = (tSirMacCapabilityInfo *)&pBssDescription->capabilityInfo; @@ -18171,7 +18104,6 @@ eHalStatus csrRoamStopJoinRetryTimer(tpAniSirGlobal pMac, tANI_U32 sessionId) transactionId - 2 bytes (tANI_U16) reasonCode - 4 bytes (sizeof(tSirResultCodes)) peerMacAddr - 6 bytes - The rest is conditionally defined of (WNI_POLARIS_FW_PRODUCT == AP) and not used */ static void csrSerDesUnpackDiassocRsp(tANI_U8 *pBuf, tSirSmeDisassocRsp *pRsp) { diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c index 4ac1d155bb74..b7e07163217e 100644 --- a/CORE/SME/src/csr/csrApiScan.c +++ b/CORE/SME/src/csr/csrApiScan.c @@ -4855,12 +4855,12 @@ static tANI_BOOLEAN csrScanIsBssAllowed(tpAniSirGlobal pMac, tSirBssDescription fAllowed = (tANI_BOOLEAN)((eCSR_DOT11_MODE_11b != phyMode) && (eCSR_DOT11_MODE_11g != phyMode)); break; case eCSR_DOT11_MODE_11n_ONLY: - fAllowed = (tANI_BOOLEAN)((eCSR_DOT11_MODE_11n == phyMode) || (eCSR_DOT11_MODE_TAURUS == phyMode)); + fAllowed = (tANI_BOOLEAN)((eCSR_DOT11_MODE_11n == phyMode)); break; #ifdef WLAN_FEATURE_11AC case eCSR_DOT11_MODE_11ac_ONLY: - fAllowed = (tANI_BOOLEAN)((eCSR_DOT11_MODE_11ac == phyMode) || (eCSR_DOT11_MODE_TAURUS == phyMode)); + fAllowed = (tANI_BOOLEAN)((eCSR_DOT11_MODE_11ac == phyMode)); break; #endif case eCSR_DOT11_MODE_11b_ONLY: @@ -4873,7 +4873,6 @@ static tANI_BOOLEAN csrScanIsBssAllowed(tpAniSirGlobal pMac, tSirBssDescription #ifdef WLAN_FEATURE_11AC case eCSR_DOT11_MODE_11ac: #endif - case eCSR_DOT11_MODE_TAURUS: default: fAllowed = eANI_BOOLEAN_TRUE; break; diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c index 4072c08a0eb2..e322637b51e4 100644 --- a/CORE/SME/src/csr/csrUtil.c +++ b/CORE/SME/src/csr/csrUtil.c @@ -1294,20 +1294,6 @@ tANI_BOOLEAN csrIsSsidEqual( tHalHandle hHal, tSirBssDescription *pSirBssDesc1, return( fEqual ); } -tANI_BOOLEAN csrIsAniWmeSupported(tDot11fIEAirgo *pIeAirgo) -{ - tANI_BOOLEAN fRet = eANI_BOOLEAN_FALSE; - - if(pIeAirgo && pIeAirgo->present && pIeAirgo->PropCapability.present) - { - fRet = (tANI_BOOLEAN)(PROP_CAPABILITY_GET( WME, pIeAirgo->PropCapability.capability )); - } - - return fRet; -} - - - //pIes can be passed in as NULL if the caller doesn't have one prepared tANI_BOOLEAN csrIsBssDescriptionWme( tHalHandle hHal, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes ) @@ -1327,8 +1313,6 @@ tANI_BOOLEAN csrIsBssDescriptionWme( tHalHandle hHal, tSirBssDescription *pSirBs break; } } - // if the AirgoProprietary indicator is found, then WME is supported... - if ( csrIsAniWmeSupported(&pIesTemp->Airgo) ) break; // if the Wme Info IE is found, then WME is supported... if ( CSR_IS_QOS_BSS(pIesTemp) ) break; // if none of these are found, then WME is NOT supported... @@ -1350,17 +1334,6 @@ tANI_BOOLEAN csrIsBssDescriptionWme( tHalHandle hHal, tSirBssDescription *pSirBs return( fWme ); } -tANI_BOOLEAN csrIsHcfEnabled( tDot11fIEAirgo *pIeAirgo ) -{ - tANI_BOOLEAN fHcfSupported = FALSE; - - fHcfSupported = ((tANI_BOOLEAN)(PROP_CAPABILITY_GET( WME, pIeAirgo->PropCapability.capability )) || - (pIeAirgo->present && pIeAirgo->HCF.present && pIeAirgo->HCF.enabled)); - - return( fHcfSupported ); -} - - eCsrMediaAccessType csrGetQoSFromBssDesc( tHalHandle hHal, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes ) { @@ -1383,20 +1356,9 @@ eCsrMediaAccessType csrGetQoSFromBssDesc( tHalHandle hHal, tSirBssDescription *p else { // if the QoS bit is on, then the AP is advertising 11E QoS... - if ( csrIsQoSBssDesc( pSirBssDesc ) ) - { - // which could be HCF or eDCF. - if ( csrIsHcfEnabled( &pIes->Airgo ) ) - { - qosType = eCSR_MEDIUM_ACCESS_11e_HCF; - } - else - { - qosType = eCSR_MEDIUM_ACCESS_11e_eDCF; - } - } - else - { + if (csrIsQoSBssDesc(pSirBssDesc)) { + qosType = eCSR_MEDIUM_ACCESS_11e_eDCF; + } else { qosType = eCSR_MEDIUM_ACCESS_DCF; } // scale back based on the types turned on for the adapter... @@ -1571,17 +1533,7 @@ tANI_U32 csrTranslateToWNICfgDot11Mode(tpAniSirGlobal pMac, eCsrCfgDot11Mode csr case eCSR_CFG_DOT11_MODE_AUTO: smsLog(pMac, LOGW, FL(" Warning: sees eCSR_CFG_DOT11_MODE_AUTO ")); //We cannot decide until now. - if(pMac->roam.configParam.ProprietaryRatesEnabled) - { - ret = WNI_CFG_DOT11_MODE_TAURUS; - } - else - { - ret = WNI_CFG_DOT11_MODE_11AC; - } - break; - case eCSR_CFG_DOT11_MODE_TAURUS: - ret = WNI_CFG_DOT11_MODE_TAURUS; + ret = WNI_CFG_DOT11_MODE_11AC; break; case eCSR_CFG_DOT11_MODE_11A: ret = WNI_CFG_DOT11_MODE_11A; @@ -1595,12 +1547,6 @@ tANI_U32 csrTranslateToWNICfgDot11Mode(tpAniSirGlobal pMac, eCsrCfgDot11Mode csr case eCSR_CFG_DOT11_MODE_11N: ret = WNI_CFG_DOT11_MODE_11N; break; - case eCSR_CFG_DOT11_MODE_POLARIS: - ret = WNI_CFG_DOT11_MODE_POLARIS; - break; - case eCSR_CFG_DOT11_MODE_TITAN: - ret = WNI_CFG_DOT11_MODE_TITAN; - break; case eCSR_CFG_DOT11_MODE_11G_ONLY: ret = WNI_CFG_DOT11_MODE_11G_ONLY; break; @@ -1640,26 +1586,13 @@ eHalStatus csrGetPhyModeFromBss(tpAniSirGlobal pMac, tSirBssDescription *pBSSDes eHalStatus status = eHAL_STATUS_SUCCESS; eCsrPhyMode phyMode = csrTranslateToPhyModeFromBssDesc(pBSSDescription); - if( pIes ) - { - if(pIes->Airgo.present) - { - if(pIes->Airgo.PropCapability.present) - { - if( PROP_CAPABILITY_GET( TAURUS, pIes->Airgo.PropCapability.capability )) - { - phyMode = eCSR_DOT11_MODE_TAURUS; - } - } - } - if(pIes->HTCaps.present && (eCSR_DOT11_MODE_TAURUS != phyMode)) - { + if (pIes) { + if (pIes->HTCaps.present) { phyMode = eCSR_DOT11_MODE_11n; } #ifdef WLAN_FEATURE_11AC - if ( pIes->VHTCaps.present && (eCSR_DOT11_MODE_TAURUS != phyMode)) - { + if (pIes->VHTCaps.present) { phyMode = eCSR_DOT11_MODE_11ac; } #endif @@ -1778,7 +1711,6 @@ tANI_BOOLEAN csrGetPhyModeInUse( eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode, cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N; break; - case eCSR_DOT11_MODE_TAURUS: default: #ifdef WLAN_FEATURE_11AC cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC; @@ -1790,11 +1722,9 @@ tANI_BOOLEAN csrGetPhyModeInUse( eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode, break; case eCSR_DOT11_MODE_11n_ONLY: - if((eCSR_DOT11_MODE_11n == bssPhyMode) || (eCSR_DOT11_MODE_TAURUS == bssPhyMode)) - { + if ((eCSR_DOT11_MODE_11n == bssPhyMode)) { fMatch = TRUE; cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N; - } break; @@ -1816,7 +1746,6 @@ tANI_BOOLEAN csrGetPhyModeInUse( eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode, cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N; break; case eCSR_DOT11_MODE_11ac: - case eCSR_DOT11_MODE_TAURUS: default: cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC; break; @@ -1824,15 +1753,13 @@ tANI_BOOLEAN csrGetPhyModeInUse( eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode, break; case eCSR_DOT11_MODE_11ac_ONLY: - if((eCSR_DOT11_MODE_11ac == bssPhyMode) || (eCSR_DOT11_MODE_TAURUS == bssPhyMode)) - { + if ((eCSR_DOT11_MODE_11ac == bssPhyMode)) { fMatch = TRUE; cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC; } break; #endif - case eCSR_DOT11_MODE_TAURUS: default: fMatch = TRUE; switch(bssPhyMode) @@ -1854,9 +1781,8 @@ tANI_BOOLEAN csrGetPhyModeInUse( eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode, cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC; break; #endif - case eCSR_DOT11_MODE_TAURUS: default: - cfgDot11Mode = eCSR_CFG_DOT11_MODE_TAURUS; + cfgDot11Mode = eCSR_CFG_DOT11_MODE_AUTO; break; } break; @@ -1888,57 +1814,33 @@ tANI_BOOLEAN csrIsPhyModeMatch( tpAniSirGlobal pMac, tANI_U32 phyMode, { tANI_BOOLEAN fMatch = FALSE; eCsrPhyMode phyModeInBssDesc, phyMode2; - eCsrCfgDot11Mode cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_TAURUS; + eCsrCfgDot11Mode cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_AUTO; tANI_U32 bitMask, loopCount; - if(HAL_STATUS_SUCCESS(csrGetPhyModeFromBss(pMac, pSirBssDesc, &phyModeInBssDesc, pIes ))) - { - //In case some change change eCSR_DOT11_MODE_TAURUS to non-0 - if ( (0 == phyMode) || (eCSR_DOT11_MODE_AUTO & phyMode) || (eCSR_DOT11_MODE_TAURUS & phyMode)) - { - //Taurus means anything - if ( eCSR_CFG_DOT11_MODE_ABG == pMac->roam.configParam.uCfgDot11Mode ) - { + if (HAL_STATUS_SUCCESS(csrGetPhyModeFromBss(pMac, pSirBssDesc, + &phyModeInBssDesc, pIes))) { + if ((0 == phyMode) || (eCSR_DOT11_MODE_AUTO & phyMode)) { + if (eCSR_CFG_DOT11_MODE_ABG == pMac->roam.configParam.uCfgDot11Mode) { phyMode = eCSR_DOT11_MODE_abg; - } - else if(eCSR_CFG_DOT11_MODE_AUTO == pMac->roam.configParam.uCfgDot11Mode) - { - if(pMac->roam.configParam.ProprietaryRatesEnabled) - { - phyMode = eCSR_DOT11_MODE_TAURUS; - } - else - { - + } else if (eCSR_CFG_DOT11_MODE_AUTO == + pMac->roam.configParam.uCfgDot11Mode) { #ifdef WLAN_FEATURE_11AC phyMode = eCSR_DOT11_MODE_11ac; #else phyMode = eCSR_DOT11_MODE_11n; #endif - - } - } - else - { + } else { //user's pick phyMode = pMac->roam.configParam.phyMode; } } - if ( (0 == phyMode) || (eCSR_DOT11_MODE_AUTO & phyMode) || (eCSR_DOT11_MODE_TAURUS & phyMode) ) - { - if(0 != phyMode) - { - if(eCSR_DOT11_MODE_AUTO & phyMode) - { + + if ((0 == phyMode) || (eCSR_DOT11_MODE_AUTO & phyMode)) { + if (0 != phyMode) { + if (eCSR_DOT11_MODE_AUTO & phyMode) { phyMode2 = eCSR_DOT11_MODE_AUTO & phyMode; } - else - { - phyMode2 = eCSR_DOT11_MODE_TAURUS & phyMode; - } - } - else - { + } else { phyMode2 = phyMode; } fMatch = csrGetPhyModeInUse( phyMode2, phyModeInBssDesc, CSR_IS_CHANNEL_5GHZ(pSirBssDesc->channelId), @@ -1967,20 +1869,16 @@ tANI_BOOLEAN csrIsPhyModeMatch( tpAniSirGlobal pMac, tANI_U32 phyMode, * by the AP or if the AP included an HT capabilities element * in its Beacons and Probe Response. */ - if( (!CSR_IS_11n_ALLOWED( pProfile->negotiatedUCEncryptionType )) && + if ((!CSR_IS_11n_ALLOWED(pProfile->negotiatedUCEncryptionType)) && ((eCSR_CFG_DOT11_MODE_11N == cfgDot11ModeToUse) || #ifdef WLAN_FEATURE_11AC - (eCSR_CFG_DOT11_MODE_11AC == cfgDot11ModeToUse) || + (eCSR_CFG_DOT11_MODE_11AC == cfgDot11ModeToUse) #endif - (eCSR_CFG_DOT11_MODE_TAURUS == cfgDot11ModeToUse)) ) - { - //We cannot do 11n here - if( !CSR_IS_CHANNEL_5GHZ(pSirBssDesc->channelId) ) - { + )) { + /* We cannot do 11n here */ + if (!CSR_IS_CHANNEL_5GHZ(pSirBssDesc->channelId)) { cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_11G; - } - else - { + } else { cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_11A; } } @@ -5568,14 +5466,7 @@ eCsrCfgDot11Mode csrGetCfgDot11ModeFromCsrPhyMode(tCsrRoamProfile *pProfile, eCs cfgDot11Mode = eCSR_CFG_DOT11_MODE_11G; break; case eCSR_DOT11_MODE_11n: - if(fProprietary) - { - cfgDot11Mode = eCSR_CFG_DOT11_MODE_TAURUS; - } - else - { - cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N; - } + cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N; break; case eCSR_DOT11_MODE_11n_ONLY: if(pProfile && CSR_IS_INFRA_AP(pProfile)) @@ -5583,9 +5474,6 @@ eCsrCfgDot11Mode csrGetCfgDot11ModeFromCsrPhyMode(tCsrRoamProfile *pProfile, eCs else cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N; break; - case eCSR_DOT11_MODE_TAURUS: - cfgDot11Mode = eCSR_CFG_DOT11_MODE_TAURUS; - break; case eCSR_DOT11_MODE_abg: cfgDot11Mode = eCSR_CFG_DOT11_MODE_ABG; break; diff --git a/CORE/SYS/legacy/src/utils/src/dot11f.c b/CORE/SYS/legacy/src/utils/src/dot11f.c index 30fa410c190b..96fa71672ca5 100644 --- a/CORE/SYS/legacy/src/utils/src/dot11f.c +++ b/CORE/SYS/legacy/src/utils/src/dot11f.c @@ -35,7 +35,7 @@ * * * This file was automatically generated by 'framesc' - * Mon Sep 15 19:24:53 2014 from the following file(s): + * Wed Sep 24 14:27:36 2014 from the following file(s): * * dot11f.frms * @@ -1544,43 +1544,6 @@ tANI_U32 dot11fUnpackTlvP2PInterface(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U1 #define SigTlvP2PManageability ( 0x002c ) -tANI_U32 dot11fUnpackIeAPName(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEAPName *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->num_name = (tANI_U8)( ielen ); - if (ielen > 32){ - pDst->present = 0; - return DOT11F_SKIPPED_BAD_IE; - } - - DOT11F_MEMCPY(pCtx, pDst->name, pBuf, ( ielen ) ); - (void)pCtx; - return status; -} /* End dot11fUnpackIeAPName. */ - -#define SigIeAPName ( 0x0001 ) - - -tANI_U32 dot11fUnpackIeBPIndicator(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEBPIndicator *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->indicator = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->type = *pBuf; - (void)pCtx; - return status; -} /* End dot11fUnpackIeBPIndicator. */ - -#define SigIeBPIndicator ( 0x0002 ) - - tANI_U32 dot11fUnpackIeCondensedCountryStr(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECondensedCountryStr *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; @@ -1592,7 +1555,7 @@ tANI_U32 dot11fUnpackIeCondensedCountryStr(tpAniSirGlobal pCtx, tANI_U8 *pBuf, t return status; } /* End dot11fUnpackIeCondensedCountryStr. */ -#define SigIeCondensedCountryStr ( 0x0003 ) +#define SigIeCondensedCountryStr ( 0x0001 ) tANI_U32 dot11fUnpackIeGTK(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEGTK *pDst) @@ -1624,10 +1587,7 @@ tANI_U32 dot11fUnpackIeGTK(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tD return status; } /* End dot11fUnpackIeGTK. */ -#define SigIeGTK ( 0x0004 ) - - -#define SigIeHCF ( 0x0005 ) +#define SigIeGTK ( 0x0002 ) tANI_U32 dot11fUnpackIeIGTK(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEIGTK *pDst) @@ -1650,231 +1610,7 @@ tANI_U32 dot11fUnpackIeIGTK(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, t return status; } /* End dot11fUnpackIeIGTK. */ -#define SigIeIGTK ( 0x0006 ) - - -tANI_U32 dot11fUnpackIeLLAttr(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIELLAttr *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - framesntohl(pCtx, &pDst->defer_threshold, pBuf, 1); - (void)pCtx; - return status; -} /* End dot11fUnpackIeLLAttr. */ - -#define SigIeLLAttr ( 0x0007 ) - - -tANI_U32 dot11fUnpackIeLoadBalance(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIELoadBalance *pDst) -{ - tANI_U32 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->bssid, pBuf, 6); - pBuf += 6; - ielen -= (tANI_U8)6; - pDst->channel = *pBuf; - (void)pCtx; - return status; -} /* End dot11fUnpackIeLoadBalance. */ - -#define SigIeLoadBalance ( 0x0008 ) - - -tANI_U32 dot11fUnpackIeLoadInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIELoadInfo *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - framesntohs(pCtx, &pDst->num_stas, pBuf, 1); - pBuf += 2; - ielen -= (tANI_U8)2; - framesntohs(pCtx, &pDst->channel_util, pBuf, 1); - (void)pCtx; - return status; -} /* End dot11fUnpackIeLoadInfo. */ - -#define SigIeLoadInfo ( 0x0009 ) - - -#define SigIePropAssocType ( 0x000a ) - - -tANI_U32 dot11fUnpackIePropCapability(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPropCapability *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - framesntohs(pCtx, &pDst->capability, pBuf, 0); - (void)pCtx; - return status; -} /* End dot11fUnpackIePropCapability. */ - -#define SigIePropCapability ( 0x000b ) - - -tANI_U32 dot11fUnpackIePropChannSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPropChannSwitchAnn *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->mode = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->primary_channel = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->sub_band = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->channel_switch_count = *pBuf; - (void)pCtx; - return status; -} /* End dot11fUnpackIePropChannSwitchAnn. */ - -#define SigIePropChannSwitchAnn ( 0x000c ) - - -tANI_U32 dot11fUnpackIePropEDCAParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPropEDCAParams *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp10__; - tANI_U8 tmp11__; - tANI_U8 tmp12__; - tANI_U8 tmp13__; - tANI_U8 tmp14__; - tANI_U8 tmp15__; - tANI_U8 tmp16__; - tANI_U8 tmp17__; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->qos = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->reserved = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - tmp10__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbe_aifsn = tmp10__ >> 0 & 0xf; - pDst->acbe_acm = tmp10__ >> 4 & 0x1; - pDst->acbe_aci = tmp10__ >> 5 & 0x3; - pDst->unused1 = tmp10__ >> 7 & 0x1; - tmp11__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbe_min = tmp11__ >> 0 & 0xf; - pDst->acbe_max = tmp11__ >> 4 & 0xf; - framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); - pBuf += 2; - ielen -= (tANI_U8)2; - tmp12__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbk_aifsn = tmp12__ >> 0 & 0xf; - pDst->acbk_acm = tmp12__ >> 4 & 0x1; - pDst->acbk_aci = tmp12__ >> 5 & 0x3; - pDst->unused2 = tmp12__ >> 7 & 0x1; - tmp13__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbk_min = tmp13__ >> 0 & 0xf; - pDst->acbk_max = tmp13__ >> 4 & 0xf; - framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); - pBuf += 2; - ielen -= (tANI_U8)2; - tmp14__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvi_aifsn = tmp14__ >> 0 & 0xf; - pDst->acvi_acm = tmp14__ >> 4 & 0x1; - pDst->acvi_aci = tmp14__ >> 5 & 0x3; - pDst->unused3 = tmp14__ >> 7 & 0x1; - tmp15__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvi_min = tmp15__ >> 0 & 0xf; - pDst->acvi_max = tmp15__ >> 4 & 0xf; - framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); - pBuf += 2; - ielen -= (tANI_U8)2; - tmp16__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvo_aifsn = tmp16__ >> 0 & 0xf; - pDst->acvo_acm = tmp16__ >> 4 & 0x1; - pDst->acvo_aci = tmp16__ >> 5 & 0x3; - pDst->unused4 = tmp16__ >> 7 & 0x1; - tmp17__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvo_min = tmp17__ >> 0 & 0xf; - pDst->acvo_max = tmp17__ >> 4 & 0xf; - framesntohs(pCtx, &pDst->acvo_txoplimit, pBuf, 0); - (void)pCtx; - return status; -} /* End dot11fUnpackIePropEDCAParams. */ - -#define SigIePropEDCAParams ( 0x000d ) - - -tANI_U32 dot11fUnpackIePropQuietBSS(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPropQuietBSS *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->quiet_count = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->quiet_period = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - framesntohs(pCtx, &pDst->quiet_duration, pBuf, 0); - pBuf += 2; - ielen -= (tANI_U8)2; - framesntohs(pCtx, &pDst->quiet_offset, pBuf, 0); - (void)pCtx; - return status; -} /* End dot11fUnpackIePropQuietBSS. */ - -#define SigIePropQuietBSS ( 0x000e ) - - -tANI_U32 dot11fUnpackIePropSuppRates(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPropSuppRates *pDst) -{ - tANI_U8 i; - tANI_U8 rate_indx = 0; - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - for (i = 0; i < ielen; i++) { - if ((DOT11F_IS_BG_RATE(pBuf[i] & 0x7F)) && - (rate_indx < 12)) { - pDst->rates[rate_indx++] = pBuf[i]; - } - } - - if(rate_indx == 0) { - pDst->present = 0; - return DOT11F_SKIPPED_BAD_IE; - } - - pDst->num_rates = rate_indx; - (void)pCtx; - return status; -} /* End dot11fUnpackIePropSuppRates. */ - -#define SigIePropSuppRates ( 0x000f ) +#define SigIeIGTK ( 0x0003 ) tANI_U32 dot11fUnpackIeR0KH_ID(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIER0KH_ID *pDst) @@ -1894,7 +1630,7 @@ tANI_U32 dot11fUnpackIeR0KH_ID(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen return status; } /* End dot11fUnpackIeR0KH_ID. */ -#define SigIeR0KH_ID ( 0x0010 ) +#define SigIeR0KH_ID ( 0x0004 ) tANI_U32 dot11fUnpackIeR1KH_ID(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIER1KH_ID *pDst) @@ -1908,7 +1644,7 @@ tANI_U32 dot11fUnpackIeR1KH_ID(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen return status; } /* End dot11fUnpackIeR1KH_ID. */ -#define SigIeR1KH_ID ( 0x0011 ) +#define SigIeR1KH_ID ( 0x0005 ) tANI_U32 dot11fUnpackIeTSFInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETSFInfo *pDst) @@ -1925,102 +1661,7 @@ tANI_U32 dot11fUnpackIeTSFInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen return status; } /* End dot11fUnpackIeTSFInfo. */ -#define SigIeTSFInfo ( 0x0012 ) - - -tANI_U32 dot11fUnpackIeTaurus(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETaurus *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U16 tmp18__; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - framesntohs(pCtx, &pDst->baTIDBitmap, pBuf, 0); - pBuf += 2; - ielen -= (tANI_U8)2; - framesntohs(pCtx, &pDst->baPolicy, pBuf, 0); - pBuf += 2; - ielen -= (tANI_U8)2; - framesntohs(pCtx, &tmp18__, pBuf, 0); - pDst->baBufferSize = tmp18__ >> 0 & 0xfff; - pDst->rsvd = tmp18__ >> 12 & 0xf; - (void)pCtx; - return status; -} /* End dot11fUnpackIeTaurus. */ - -#define SigIeTaurus ( 0x0013 ) - - -tANI_U32 dot11fUnpackIeTitan(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETitan *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->concat_tcid_bitmap = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->compression_tcid_bitmap = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->cb_state = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->rev_fcs_state = *pBuf; - (void)pCtx; - return status; -} /* End dot11fUnpackIeTitan. */ - -#define SigIeTitan ( 0x0014 ) - - -#define SigIeTriggerStaBgScan ( 0x0015 ) - - -tANI_U32 dot11fUnpackIeVersion(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVersion *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - framesntohl(pCtx, &pDst->chip_rev, pBuf, 0); - pBuf += 4; - ielen -= (tANI_U8)4; - pDst->card_type = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->num_build_version = (tANI_U8)( ielen ); - if (ielen > 20){ - pDst->present = 0; - return DOT11F_SKIPPED_BAD_IE; - } - - DOT11F_MEMCPY(pCtx, pDst->build_version, pBuf, ( ielen ) ); - (void)pCtx; - return status; -} /* End dot11fUnpackIeVersion. */ - -#define SigIeVersion ( 0x0016 ) - - -tANI_U32 dot11fUnpackIeWDS(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWDS *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->num_wdsData = (tANI_U8)( ielen ); - if (ielen > 64){ - pDst->present = 0; - return DOT11F_SKIPPED_BAD_IE; - } - - DOT11F_MEMCPY(pCtx, pDst->wdsData, pBuf, ( ielen ) ); - (void)pCtx; - return status; -} /* End dot11fUnpackIeWDS. */ - -#define SigIeWDS ( 0x0017 ) +#define SigIeTSFInfo ( 0x0006 ) tANI_U32 dot11fUnpackIeAPChannelReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEAPChannelReport *pDst) @@ -2043,7 +1684,7 @@ tANI_U32 dot11fUnpackIeAPChannelReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_ return status; } /* End dot11fUnpackIeAPChannelReport. */ -#define SigIeAPChannelReport ( 0x0018 ) +#define SigIeAPChannelReport ( 0x0007 ) tANI_U32 dot11fUnpackIeBcnReportingDetail(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEBcnReportingDetail *pDst) @@ -2057,7 +1698,7 @@ tANI_U32 dot11fUnpackIeBcnReportingDetail(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tA return status; } /* End dot11fUnpackIeBcnReportingDetail. */ -#define SigIeBcnReportingDetail ( 0x0019 ) +#define SigIeBcnReportingDetail ( 0x0008 ) tANI_U32 dot11fUnpackIeBeaconReportFrmBody(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEBeaconReportFrmBody *pDst) @@ -2077,7 +1718,7 @@ tANI_U32 dot11fUnpackIeBeaconReportFrmBody(tpAniSirGlobal pCtx, tANI_U8 *pBuf, t return status; } /* End dot11fUnpackIeBeaconReportFrmBody. */ -#define SigIeBeaconReportFrmBody ( 0x001a ) +#define SigIeBeaconReportFrmBody ( 0x0009 ) tANI_U32 dot11fUnpackIeBeaconReporting(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEBeaconReporting *pDst) @@ -2094,7 +1735,7 @@ tANI_U32 dot11fUnpackIeBeaconReporting(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_ return status; } /* End dot11fUnpackIeBeaconReporting. */ -#define SigIeBeaconReporting ( 0x001b ) +#define SigIeBeaconReporting ( 0x000a ) tANI_U32 dot11fUnpackIeMeasurementPilot(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEMeasurementPilot *pDst) @@ -2112,7 +1753,7 @@ tANI_U32 dot11fUnpackIeMeasurementPilot(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI return status; } /* End dot11fUnpackIeMeasurementPilot. */ -#define SigIeMeasurementPilot ( 0x001c ) +#define SigIeMeasurementPilot ( 0x000b ) tANI_U32 dot11fUnpackIeMultiBssid(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEMultiBssid *pDst) @@ -2130,7 +1771,7 @@ tANI_U32 dot11fUnpackIeMultiBssid(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie return status; } /* End dot11fUnpackIeMultiBssid. */ -#define SigIeMultiBssid ( 0x001d ) +#define SigIeMultiBssid ( 0x000c ) tANI_U32 dot11fUnpackIeRICData(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERICData *pDst) @@ -2150,7 +1791,7 @@ tANI_U32 dot11fUnpackIeRICData(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen return status; } /* End dot11fUnpackIeRICData. */ -#define SigIeRICData ( 0x001e ) +#define SigIeRICData ( 0x000d ) tANI_U32 dot11fUnpackIeRICDescriptor(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERICDescriptor *pDst) @@ -2168,67 +1809,67 @@ tANI_U32 dot11fUnpackIeRICDescriptor(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeRICDescriptor. */ -#define SigIeRICDescriptor ( 0x001f ) +#define SigIeRICDescriptor ( 0x000e ) tANI_U32 dot11fUnpackIeRRMEnabledCap(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERRMEnabledCap *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp19__; - tANI_U8 tmp20__; - tANI_U8 tmp21__; - tANI_U8 tmp22__; - tANI_U8 tmp23__; + tANI_U8 tmp10__; + tANI_U8 tmp11__; + tANI_U8 tmp12__; + tANI_U8 tmp13__; + tANI_U8 tmp14__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp19__ = *pBuf; + tmp10__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->LinkMeasurement = tmp19__ >> 0 & 0x1; - pDst->NeighborRpt = tmp19__ >> 1 & 0x1; - pDst->parallel = tmp19__ >> 2 & 0x1; - pDst->repeated = tmp19__ >> 3 & 0x1; - pDst->BeaconPassive = tmp19__ >> 4 & 0x1; - pDst->BeaconActive = tmp19__ >> 5 & 0x1; - pDst->BeaconTable = tmp19__ >> 6 & 0x1; - pDst->BeaconRepCond = tmp19__ >> 7 & 0x1; - tmp20__ = *pBuf; + pDst->LinkMeasurement = tmp10__ >> 0 & 0x1; + pDst->NeighborRpt = tmp10__ >> 1 & 0x1; + pDst->parallel = tmp10__ >> 2 & 0x1; + pDst->repeated = tmp10__ >> 3 & 0x1; + pDst->BeaconPassive = tmp10__ >> 4 & 0x1; + pDst->BeaconActive = tmp10__ >> 5 & 0x1; + pDst->BeaconTable = tmp10__ >> 6 & 0x1; + pDst->BeaconRepCond = tmp10__ >> 7 & 0x1; + tmp11__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->FrameMeasurement = tmp20__ >> 0 & 0x1; - pDst->ChannelLoad = tmp20__ >> 1 & 0x1; - pDst->NoiseHistogram = tmp20__ >> 2 & 0x1; - pDst->statistics = tmp20__ >> 3 & 0x1; - pDst->LCIMeasurement = tmp20__ >> 4 & 0x1; - pDst->LCIAzimuth = tmp20__ >> 5 & 0x1; - pDst->TCMCapability = tmp20__ >> 6 & 0x1; - pDst->triggeredTCM = tmp20__ >> 7 & 0x1; - tmp21__ = *pBuf; + pDst->FrameMeasurement = tmp11__ >> 0 & 0x1; + pDst->ChannelLoad = tmp11__ >> 1 & 0x1; + pDst->NoiseHistogram = tmp11__ >> 2 & 0x1; + pDst->statistics = tmp11__ >> 3 & 0x1; + pDst->LCIMeasurement = tmp11__ >> 4 & 0x1; + pDst->LCIAzimuth = tmp11__ >> 5 & 0x1; + pDst->TCMCapability = tmp11__ >> 6 & 0x1; + pDst->triggeredTCM = tmp11__ >> 7 & 0x1; + tmp12__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->APChanReport = tmp21__ >> 0 & 0x1; - pDst->RRMMIBEnabled = tmp21__ >> 1 & 0x1; - pDst->operatingChanMax = tmp21__ >> 2 & 0x7; - pDst->nonOperatinChanMax = tmp21__ >> 5 & 0x7; - tmp22__ = *pBuf; + pDst->APChanReport = tmp12__ >> 0 & 0x1; + pDst->RRMMIBEnabled = tmp12__ >> 1 & 0x1; + pDst->operatingChanMax = tmp12__ >> 2 & 0x7; + pDst->nonOperatinChanMax = tmp12__ >> 5 & 0x7; + tmp13__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->MeasurementPilot = tmp22__ >> 0 & 0x7; - pDst->MeasurementPilotEnabled = tmp22__ >> 3 & 0x1; - pDst->NeighborTSFOffset = tmp22__ >> 4 & 0x1; - pDst->RCPIMeasurement = tmp22__ >> 5 & 0x1; - pDst->RSNIMeasurement = tmp22__ >> 6 & 0x1; - pDst->BssAvgAccessDelay = tmp22__ >> 7 & 0x1; - tmp23__ = *pBuf; - pDst->BSSAvailAdmission = tmp23__ >> 0 & 0x1; - pDst->AntennaInformation = tmp23__ >> 1 & 0x1; - pDst->reserved = tmp23__ >> 2 & 0x3f; + pDst->MeasurementPilot = tmp13__ >> 0 & 0x7; + pDst->MeasurementPilotEnabled = tmp13__ >> 3 & 0x1; + pDst->NeighborTSFOffset = tmp13__ >> 4 & 0x1; + pDst->RCPIMeasurement = tmp13__ >> 5 & 0x1; + pDst->RSNIMeasurement = tmp13__ >> 6 & 0x1; + pDst->BssAvgAccessDelay = tmp13__ >> 7 & 0x1; + tmp14__ = *pBuf; + pDst->BSSAvailAdmission = tmp14__ >> 0 & 0x1; + pDst->AntennaInformation = tmp14__ >> 1 & 0x1; + pDst->reserved = tmp14__ >> 2 & 0x3f; (void)pCtx; return status; } /* End dot11fUnpackIeRRMEnabledCap. */ -#define SigIeRRMEnabledCap ( 0x0020 ) +#define SigIeRRMEnabledCap ( 0x000f ) tANI_U32 dot11fUnpackIeRequestedInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERequestedInfo *pDst) @@ -2243,7 +1884,7 @@ tANI_U32 dot11fUnpackIeRequestedInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeRequestedInfo. */ -#define SigIeRequestedInfo ( 0x0021 ) +#define SigIeRequestedInfo ( 0x0010 ) tANI_U32 dot11fUnpackIeSSID(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESSID *pDst) @@ -2267,23 +1908,23 @@ tANI_U32 dot11fUnpackIeSSID(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, t return status; } /* End dot11fUnpackIeSSID. */ -#define SigIeSSID ( 0x0022 ) +#define SigIeSSID ( 0x0011 ) tANI_U32 dot11fUnpackIeSchedule(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESchedule *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U16 tmp24__; + tANI_U16 tmp15__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp24__, pBuf, 0); + framesntohs(pCtx, &tmp15__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->aggregation = tmp24__ >> 0 & 0x1; - pDst->tsid = tmp24__ >> 1 & 0xf; - pDst->direction = tmp24__ >> 5 & 0x3; - pDst->reserved = tmp24__ >> 7 & 0x1ff; + pDst->aggregation = tmp15__ >> 0 & 0x1; + pDst->tsid = tmp15__ >> 1 & 0xf; + pDst->direction = tmp15__ >> 5 & 0x3; + pDst->reserved = tmp15__ >> 7 & 0x1ff; framesntohl(pCtx, &pDst->service_start_time, pBuf, 0); pBuf += 4; ielen -= (tANI_U8)4; @@ -2298,7 +1939,7 @@ tANI_U32 dot11fUnpackIeSchedule(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iele return status; } /* End dot11fUnpackIeSchedule. */ -#define SigIeSchedule ( 0x0023 ) +#define SigIeSchedule ( 0x0012 ) tANI_U32 dot11fUnpackIeTCLAS(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETCLAS *pDst) @@ -2387,10 +2028,10 @@ tANI_U32 dot11fUnpackIeTCLAS(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeTCLAS. */ -#define SigIeTCLAS ( 0x0024 ) +#define SigIeTCLAS ( 0x0013 ) -#define SigIeTCLASSPROC ( 0x0025 ) +#define SigIeTCLASSPROC ( 0x0014 ) tANI_U32 dot11fUnpackIeTSDelay(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETSDelay *pDst) @@ -2404,39 +2045,39 @@ tANI_U32 dot11fUnpackIeTSDelay(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen return status; } /* End dot11fUnpackIeTSDelay. */ -#define SigIeTSDelay ( 0x0026 ) +#define SigIeTSDelay ( 0x0015 ) tANI_U32 dot11fUnpackIeTSPEC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETSPEC *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U16 tmp25__; - tANI_U8 tmp26__; - tANI_U16 tmp27__; + tANI_U16 tmp16__; + tANI_U8 tmp17__; + tANI_U16 tmp18__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp25__, pBuf, 0); + framesntohs(pCtx, &tmp16__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->traffic_type = tmp25__ >> 0 & 0x1; - pDst->tsid = tmp25__ >> 1 & 0xf; - pDst->direction = tmp25__ >> 5 & 0x3; - pDst->access_policy = tmp25__ >> 7 & 0x3; - pDst->aggregation = tmp25__ >> 9 & 0x1; - pDst->psb = tmp25__ >> 10 & 0x1; - pDst->user_priority = tmp25__ >> 11 & 0x7; - pDst->tsinfo_ack_pol = tmp25__ >> 14 & 0x3; - tmp26__ = *pBuf; + pDst->traffic_type = tmp16__ >> 0 & 0x1; + pDst->tsid = tmp16__ >> 1 & 0xf; + pDst->direction = tmp16__ >> 5 & 0x3; + pDst->access_policy = tmp16__ >> 7 & 0x3; + pDst->aggregation = tmp16__ >> 9 & 0x1; + pDst->psb = tmp16__ >> 10 & 0x1; + pDst->user_priority = tmp16__ >> 11 & 0x7; + pDst->tsinfo_ack_pol = tmp16__ >> 14 & 0x3; + tmp17__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->schedule = tmp26__ >> 0 & 0x1; - pDst->unused = tmp26__ >> 1 & 0x7f; - framesntohs(pCtx, &tmp27__, pBuf, 0); + pDst->schedule = tmp17__ >> 0 & 0x1; + pDst->unused = tmp17__ >> 1 & 0x7f; + framesntohs(pCtx, &tmp18__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->size = tmp27__ >> 0 & 0x7fff; - pDst->fixed = tmp27__ >> 15 & 0x1; + pDst->size = tmp18__ >> 0 & 0x7fff; + pDst->fixed = tmp18__ >> 15 & 0x1; framesntohs(pCtx, &pDst->max_msdu_size, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; @@ -2481,13 +2122,13 @@ tANI_U32 dot11fUnpackIeTSPEC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeTSPEC. */ -#define SigIeTSPEC ( 0x0027 ) +#define SigIeTSPEC ( 0x0016 ) tANI_U32 dot11fUnpackIeWMMSchedule(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMSchedule *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U16 tmp28__; + tANI_U16 tmp19__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; @@ -2499,13 +2140,13 @@ tANI_U32 dot11fUnpackIeWMMSchedule(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i pDst->present = 0; return ( status | DOT11F_BAD_FIXED_VALUE ); } - framesntohs(pCtx, &tmp28__, pBuf, 0); + framesntohs(pCtx, &tmp19__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->aggregation = tmp28__ >> 0 & 0x1; - pDst->tsid = tmp28__ >> 1 & 0xf; - pDst->direction = tmp28__ >> 5 & 0x3; - pDst->reserved = tmp28__ >> 7 & 0x1ff; + pDst->aggregation = tmp19__ >> 0 & 0x1; + pDst->tsid = tmp19__ >> 1 & 0xf; + pDst->direction = tmp19__ >> 5 & 0x3; + pDst->reserved = tmp19__ >> 7 & 0x1ff; framesntohl(pCtx, &pDst->service_start_time, pBuf, 0); pBuf += 4; ielen -= (tANI_U8)4; @@ -2520,7 +2161,7 @@ tANI_U32 dot11fUnpackIeWMMSchedule(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWMMSchedule. */ -#define SigIeWMMSchedule ( 0x0028 ) +#define SigIeWMMSchedule ( 0x0017 ) tANI_U32 dot11fUnpackIeWMMTCLAS(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMTCLAS *pDst) @@ -2617,7 +2258,7 @@ tANI_U32 dot11fUnpackIeWMMTCLAS(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iele return status; } /* End dot11fUnpackIeWMMTCLAS. */ -#define SigIeWMMTCLAS ( 0x0029 ) +#define SigIeWMMTCLAS ( 0x0018 ) tANI_U32 dot11fUnpackIeWMMTCLASPROC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMTCLASPROC *pDst) @@ -2639,7 +2280,7 @@ tANI_U32 dot11fUnpackIeWMMTCLASPROC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeWMMTCLASPROC. */ -#define SigIeWMMTCLASPROC ( 0x002a ) +#define SigIeWMMTCLASPROC ( 0x0019 ) tANI_U32 dot11fUnpackIeWMMTSDelay(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMTSDelay *pDst) @@ -2661,15 +2302,15 @@ tANI_U32 dot11fUnpackIeWMMTSDelay(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie return status; } /* End dot11fUnpackIeWMMTSDelay. */ -#define SigIeWMMTSDelay ( 0x002b ) +#define SigIeWMMTSDelay ( 0x001a ) tANI_U32 dot11fUnpackIeWMMTSPEC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMTSPEC *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U16 tmp29__; - tANI_U8 tmp30__; - tANI_U16 tmp31__; + tANI_U16 tmp20__; + tANI_U8 tmp21__; + tANI_U16 tmp22__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; @@ -2681,27 +2322,27 @@ tANI_U32 dot11fUnpackIeWMMTSPEC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iele pDst->present = 0; return ( status | DOT11F_BAD_FIXED_VALUE ); } - framesntohs(pCtx, &tmp29__, pBuf, 0); + framesntohs(pCtx, &tmp20__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->traffic_type = tmp29__ >> 0 & 0x1; - pDst->tsid = tmp29__ >> 1 & 0xf; - pDst->direction = tmp29__ >> 5 & 0x3; - pDst->access_policy = tmp29__ >> 7 & 0x3; - pDst->aggregation = tmp29__ >> 9 & 0x1; - pDst->psb = tmp29__ >> 10 & 0x1; - pDst->user_priority = tmp29__ >> 11 & 0x7; - pDst->tsinfo_ack_pol = tmp29__ >> 14 & 0x3; - tmp30__ = *pBuf; + pDst->traffic_type = tmp20__ >> 0 & 0x1; + pDst->tsid = tmp20__ >> 1 & 0xf; + pDst->direction = tmp20__ >> 5 & 0x3; + pDst->access_policy = tmp20__ >> 7 & 0x3; + pDst->aggregation = tmp20__ >> 9 & 0x1; + pDst->psb = tmp20__ >> 10 & 0x1; + pDst->user_priority = tmp20__ >> 11 & 0x7; + pDst->tsinfo_ack_pol = tmp20__ >> 14 & 0x3; + tmp21__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->tsinfo_rsvd = tmp30__ >> 0 & 0x7f; - pDst->burst_size_defn = tmp30__ >> 7 & 0x1; - framesntohs(pCtx, &tmp31__, pBuf, 0); + pDst->tsinfo_rsvd = tmp21__ >> 0 & 0x7f; + pDst->burst_size_defn = tmp21__ >> 7 & 0x1; + framesntohs(pCtx, &tmp22__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->size = tmp31__ >> 0 & 0x7fff; - pDst->fixed = tmp31__ >> 15 & 0x1; + pDst->size = tmp22__ >> 0 & 0x7fff; + pDst->fixed = tmp22__ >> 15 & 0x1; framesntohs(pCtx, &pDst->max_msdu_size, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; @@ -2746,7 +2387,7 @@ tANI_U32 dot11fUnpackIeWMMTSPEC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iele return status; } /* End dot11fUnpackIeWMMTSPEC. */ -#define SigIeWMMTSPEC ( 0x002c ) +#define SigIeWMMTSPEC ( 0x001b ) tANI_U32 dot11fUnpackIeWiderBWChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWiderBWChanSwitchAnn *pDst) @@ -2766,7 +2407,7 @@ tANI_U32 dot11fUnpackIeWiderBWChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, return status; } /* End dot11fUnpackIeWiderBWChanSwitchAnn. */ -#define SigIeWiderBWChanSwitchAnn ( 0x002d ) +#define SigIeWiderBWChanSwitchAnn ( 0x001c ) tANI_U32 dot11fUnpackIeAID(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEAID *pDst) @@ -2780,52 +2421,7 @@ tANI_U32 dot11fUnpackIeAID(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tD return status; } /* End dot11fUnpackIeAID. */ -#define SigIeAID ( 0x002e ) - - - static const tFFDefn FFS_Airgo[ ] = { - { NULL, 0, 0, 0,}, - }; - - static const tIEDefn IES_Airgo[ ] = { - {offsetof(tDot11fIEAirgo, PropSuppRates), offsetof(tDot11fIEPropSuppRates, present), 0, "PropSuppRates" , 0, 3, 14, SigIePropSuppRates, {0, 0, 0, 0, 0}, 0, DOT11F_EID_PROPSUPPRATES, 0, }, - {offsetof(tDot11fIEAirgo, APName), offsetof(tDot11fIEAPName, present), 0, "APName" , 0, 3, 34, SigIeAPName, {0, 0, 0, 0, 0}, 0, DOT11F_EID_APNAME, 0, }, - {offsetof(tDot11fIEAirgo, HCF), offsetof(tDot11fIEHCF, present), 0, "HCF" , 0, 3, 3, SigIeHCF, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HCF, 0, }, - {offsetof(tDot11fIEAirgo, WDS), offsetof(tDot11fIEWDS, present), 0, "WDS" , 0, 2, 66, SigIeWDS, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WDS, 0, }, - {offsetof(tDot11fIEAirgo, BPIndicator), offsetof(tDot11fIEBPIndicator, present), 0, "BPIndicator" , 0, 4, 4, SigIeBPIndicator, {0, 0, 0, 0, 0}, 0, DOT11F_EID_BPINDICATOR, 0, }, - {offsetof(tDot11fIEAirgo, LoadInfo), offsetof(tDot11fIELoadInfo, present), 0, "LoadInfo" , 0, 6, 6, SigIeLoadInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_LOADINFO, 0, }, - {offsetof(tDot11fIEAirgo, LoadBalance), offsetof(tDot11fIELoadBalance, present), 0, "LoadBalance" , 0, 9, 9, SigIeLoadBalance, {0, 0, 0, 0, 0}, 0, DOT11F_EID_LOADBALANCE, 0, }, - {offsetof(tDot11fIEAirgo, PropAssocType), offsetof(tDot11fIEPropAssocType, present), 0, "PropAssocType" , 0, 3, 3, SigIePropAssocType, {0, 0, 0, 0, 0}, 0, DOT11F_EID_PROPASSOCTYPE, 0, }, - {offsetof(tDot11fIEAirgo, LLAttr), offsetof(tDot11fIELLAttr, present), 0, "LLAttr" , 0, 6, 6, SigIeLLAttr, {0, 0, 0, 0, 0}, 0, DOT11F_EID_LLATTR, 0, }, - {offsetof(tDot11fIEAirgo, PropCapability), offsetof(tDot11fIEPropCapability, present), 0, "PropCapability" , 0, 4, 4, SigIePropCapability, {0, 0, 0, 0, 0}, 0, DOT11F_EID_PROPCAPABILITY, 0, }, - {offsetof(tDot11fIEAirgo, Version), offsetof(tDot11fIEVersion, present), 0, "Version" , 0, 7, 27, SigIeVersion, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VERSION, 0, }, - {offsetof(tDot11fIEAirgo, PropEDCAParams), offsetof(tDot11fIEPropEDCAParams, present), 0, "PropEDCAParams" , 0, 20, 20, SigIePropEDCAParams, {0, 0, 0, 0, 0}, 0, DOT11F_EID_PROPEDCAPARAMS, 0, }, - {offsetof(tDot11fIEAirgo, Titan), offsetof(tDot11fIETitan, present), 0, "Titan" , 0, 6, 6, SigIeTitan, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TITAN, 0, }, - {offsetof(tDot11fIEAirgo, PropChannSwitchAnn), offsetof(tDot11fIEPropChannSwitchAnn, present), 0, "PropChannSwitchAnn" , 0, 6, 6, SigIePropChannSwitchAnn, {0, 0, 0, 0, 0}, 0, DOT11F_EID_PROPCHANNSWITCHANN, 0, }, - {offsetof(tDot11fIEAirgo, PropQuietBSS), offsetof(tDot11fIEPropQuietBSS, present), 0, "PropQuietBSS" , 0, 8, 8, SigIePropQuietBSS, {0, 0, 0, 0, 0}, 0, DOT11F_EID_PROPQUIETBSS, 0, }, - {offsetof(tDot11fIEAirgo, TriggerStaBgScan), offsetof(tDot11fIETriggerStaBgScan, present), 0, "TriggerStaBgScan" , 0, 3, 3, SigIeTriggerStaBgScan, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TRIGGERSTABGSCAN, 0, }, - {offsetof(tDot11fIEAirgo, Taurus), offsetof(tDot11fIETaurus, present), 0, "Taurus" , 0, 8, 8, SigIeTaurus, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TAURUS, 0, }, - {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, - }; - -tANI_U32 dot11fUnpackIeAirgo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEAirgo *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - (void)pCtx; - status |= UnpackCore(pCtx, - pBuf, - ielen, - FFS_Airgo, - IES_Airgo, - ( tANI_U8* )pDst, - sizeof(*pDst)); - return status; -} /* End dot11fUnpackIeAirgo. */ - -#define SigIeAirgo ( 0x002f ) +#define SigIeAID ( 0x001d ) tANI_U32 dot11fUnpackIeCFParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECFParams *pDst) @@ -2848,7 +2444,7 @@ tANI_U32 dot11fUnpackIeCFParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iele return status; } /* End dot11fUnpackIeCFParams. */ -#define SigIeCFParams ( 0x0030 ) +#define SigIeCFParams ( 0x001e ) tANI_U32 dot11fUnpackIeChallengeText(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEChallengeText *pDst) @@ -2868,7 +2464,7 @@ tANI_U32 dot11fUnpackIeChallengeText(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeChallengeText. */ -#define SigIeChallengeText ( 0x0031 ) +#define SigIeChallengeText ( 0x001f ) tANI_U32 dot11fUnpackIeChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEChanSwitchAnn *pDst) @@ -2888,7 +2484,7 @@ tANI_U32 dot11fUnpackIeChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeChanSwitchAnn. */ -#define SigIeChanSwitchAnn ( 0x0032 ) +#define SigIeChanSwitchAnn ( 0x0020 ) static const tFFDefn FFS_ChannelSwitchWrapper[ ] = { @@ -2917,7 +2513,7 @@ tANI_U32 dot11fUnpackIeChannelSwitchWrapper(tpAniSirGlobal pCtx, tANI_U8 *pBuf, return status; } /* End dot11fUnpackIeChannelSwitchWrapper. */ -#define SigIeChannelSwitchWrapper ( 0x0033 ) +#define SigIeChannelSwitchWrapper ( 0x0021 ) tANI_U32 dot11fUnpackIeCountry(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECountry *pDst) @@ -2948,23 +2544,23 @@ tANI_U32 dot11fUnpackIeCountry(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen return status; } /* End dot11fUnpackIeCountry. */ -#define SigIeCountry ( 0x0034 ) +#define SigIeCountry ( 0x0022 ) -#define SigIeDSParams ( 0x0035 ) +#define SigIeDSParams ( 0x0023 ) tANI_U32 dot11fUnpackIeEDCAParamSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEEDCAParamSet *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp32__; - tANI_U8 tmp33__; - tANI_U8 tmp34__; - tANI_U8 tmp35__; - tANI_U8 tmp36__; - tANI_U8 tmp37__; - tANI_U8 tmp38__; - tANI_U8 tmp39__; + tANI_U8 tmp23__; + tANI_U8 tmp24__; + tANI_U8 tmp25__; + tANI_U8 tmp26__; + tANI_U8 tmp27__; + tANI_U8 tmp28__; + tANI_U8 tmp29__; + tANI_U8 tmp30__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; @@ -2974,88 +2570,88 @@ tANI_U32 dot11fUnpackIeEDCAParamSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 pDst->reserved = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; - tmp32__ = *pBuf; + tmp23__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_aifsn = tmp32__ >> 0 & 0xf; - pDst->acbe_acm = tmp32__ >> 4 & 0x1; - pDst->acbe_aci = tmp32__ >> 5 & 0x3; - pDst->unused1 = tmp32__ >> 7 & 0x1; - tmp33__ = *pBuf; + pDst->acbe_aifsn = tmp23__ >> 0 & 0xf; + pDst->acbe_acm = tmp23__ >> 4 & 0x1; + pDst->acbe_aci = tmp23__ >> 5 & 0x3; + pDst->unused1 = tmp23__ >> 7 & 0x1; + tmp24__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_acwmin = tmp33__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp33__ >> 4 & 0xf; + pDst->acbe_acwmin = tmp24__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp24__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp34__ = *pBuf; + tmp25__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp34__ >> 0 & 0xf; - pDst->acbk_acm = tmp34__ >> 4 & 0x1; - pDst->acbk_aci = tmp34__ >> 5 & 0x3; - pDst->unused2 = tmp34__ >> 7 & 0x1; - tmp35__ = *pBuf; + pDst->acbk_aifsn = tmp25__ >> 0 & 0xf; + pDst->acbk_acm = tmp25__ >> 4 & 0x1; + pDst->acbk_aci = tmp25__ >> 5 & 0x3; + pDst->unused2 = tmp25__ >> 7 & 0x1; + tmp26__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_acwmin = tmp35__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp35__ >> 4 & 0xf; + pDst->acbk_acwmin = tmp26__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp26__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp36__ = *pBuf; + tmp27__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp36__ >> 0 & 0xf; - pDst->acvi_acm = tmp36__ >> 4 & 0x1; - pDst->acvi_aci = tmp36__ >> 5 & 0x3; - pDst->unused3 = tmp36__ >> 7 & 0x1; - tmp37__ = *pBuf; + pDst->acvi_aifsn = tmp27__ >> 0 & 0xf; + pDst->acvi_acm = tmp27__ >> 4 & 0x1; + pDst->acvi_aci = tmp27__ >> 5 & 0x3; + pDst->unused3 = tmp27__ >> 7 & 0x1; + tmp28__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_acwmin = tmp37__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp37__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp28__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp28__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp38__ = *pBuf; + tmp29__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp38__ >> 0 & 0xf; - pDst->acvo_acm = tmp38__ >> 4 & 0x1; - pDst->acvo_aci = tmp38__ >> 5 & 0x3; - pDst->unused4 = tmp38__ >> 7 & 0x1; - tmp39__ = *pBuf; + pDst->acvo_aifsn = tmp29__ >> 0 & 0xf; + pDst->acvo_acm = tmp29__ >> 4 & 0x1; + pDst->acvo_aci = tmp29__ >> 5 & 0x3; + pDst->unused4 = tmp29__ >> 7 & 0x1; + tmp30__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_acwmin = tmp39__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp39__ >> 4 & 0xf; + pDst->acvo_acwmin = tmp30__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp30__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvo_txoplimit, pBuf, 0); (void)pCtx; return status; } /* End dot11fUnpackIeEDCAParamSet. */ -#define SigIeEDCAParamSet ( 0x0036 ) +#define SigIeEDCAParamSet ( 0x0024 ) tANI_U32 dot11fUnpackIeERPInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEERPInfo *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp40__; + tANI_U8 tmp31__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp40__ = *pBuf; - pDst->non_erp_present = tmp40__ >> 0 & 0x1; - pDst->use_prot = tmp40__ >> 1 & 0x1; - pDst->barker_preamble = tmp40__ >> 2 & 0x1; - pDst->unused = tmp40__ >> 3 & 0x1f; + tmp31__ = *pBuf; + pDst->non_erp_present = tmp31__ >> 0 & 0x1; + pDst->use_prot = tmp31__ >> 1 & 0x1; + pDst->barker_preamble = tmp31__ >> 2 & 0x1; + pDst->unused = tmp31__ >> 3 & 0x1f; (void)pCtx; return status; } /* End dot11fUnpackIeERPInfo. */ -#define SigIeERPInfo ( 0x0037 ) +#define SigIeERPInfo ( 0x0025 ) tANI_U32 dot11fUnpackIeESECckmOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESECckmOpaque *pDst) @@ -3075,27 +2671,27 @@ tANI_U32 dot11fUnpackIeESECckmOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeESECckmOpaque. */ -#define SigIeESECckmOpaque ( 0x0038 ) +#define SigIeESECckmOpaque ( 0x0026 ) tANI_U32 dot11fUnpackIeESERadMgmtCap(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESERadMgmtCap *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp41__; + tANI_U8 tmp32__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; pDst->mgmt_state = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; - tmp41__ = *pBuf; - pDst->mbssid_mask = tmp41__ >> 0 & 0x7; - pDst->reserved = tmp41__ >> 3 & 0x1f; + tmp32__ = *pBuf; + pDst->mbssid_mask = tmp32__ >> 0 & 0x7; + pDst->reserved = tmp32__ >> 3 & 0x1f; (void)pCtx; return status; } /* End dot11fUnpackIeESERadMgmtCap. */ -#define SigIeESERadMgmtCap ( 0x0039 ) +#define SigIeESERadMgmtCap ( 0x0027 ) tANI_U32 dot11fUnpackIeESETrafStrmMet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESETrafStrmMet *pDst) @@ -3115,7 +2711,7 @@ tANI_U32 dot11fUnpackIeESETrafStrmMet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U return status; } /* End dot11fUnpackIeESETrafStrmMet. */ -#define SigIeESETrafStrmMet ( 0x003a ) +#define SigIeESETrafStrmMet ( 0x0028 ) tANI_U32 dot11fUnpackIeESETrafStrmRateSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESETrafStrmRateSet *pDst) @@ -3138,7 +2734,7 @@ tANI_U32 dot11fUnpackIeESETrafStrmRateSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tA return status; } /* End dot11fUnpackIeESETrafStrmRateSet. */ -#define SigIeESETrafStrmRateSet ( 0x003b ) +#define SigIeESETrafStrmRateSet ( 0x0029 ) tANI_U32 dot11fUnpackIeESETxmitPower(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESETxmitPower *pDst) @@ -3155,7 +2751,7 @@ tANI_U32 dot11fUnpackIeESETxmitPower(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeESETxmitPower. */ -#define SigIeESETxmitPower ( 0x003c ) +#define SigIeESETxmitPower ( 0x002a ) tANI_U32 dot11fUnpackIeESEVersion(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESEVersion *pDst) @@ -3169,156 +2765,127 @@ tANI_U32 dot11fUnpackIeESEVersion(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie return status; } /* End dot11fUnpackIeESEVersion. */ -#define SigIeESEVersion ( 0x003d ) +#define SigIeESEVersion ( 0x002b ) tANI_U32 dot11fUnpackIeExtCap(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEExtCap *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp42__; - tANI_U8 tmp43__; - tANI_U8 tmp44__; - tANI_U8 tmp45__; - tANI_U8 tmp46__; - tANI_U8 tmp47__; - tANI_U8 tmp48__; - tANI_U8 tmp49__; - tANI_U8 tmp50__; + tANI_U8 tmp33__; + tANI_U8 tmp34__; + tANI_U8 tmp35__; + tANI_U8 tmp36__; + tANI_U8 tmp37__; + tANI_U8 tmp38__; + tANI_U8 tmp39__; + tANI_U8 tmp40__; + tANI_U8 tmp41__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - - if (!ielen) /* Check to ensure copying of ielen bytes */ - goto endUnpackIeExtCap; - tmp42__ = *pBuf; + tmp33__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->bssCoexistMgmtSupport = tmp42__ >> 0 & 0x1; - pDst->reserved1 = tmp42__ >> 1 & 0x1; - pDst->extChanSwitch = tmp42__ >> 2 & 0x1; - pDst->reserved2 = tmp42__ >> 3 & 0x1; - pDst->psmpCap = tmp42__ >> 4 & 0x1; - pDst->reserved3 = tmp42__ >> 5 & 0x1; - pDst->spsmpCap = tmp42__ >> 6 & 0x1; - pDst->event = tmp42__ >> 7 & 0x1; - - if (!ielen) /* Check to ensure copying of ielen bytes */ - goto endUnpackIeExtCap; - tmp43__ = *pBuf; + pDst->bssCoexistMgmtSupport = tmp33__ >> 0 & 0x1; + pDst->reserved1 = tmp33__ >> 1 & 0x1; + pDst->extChanSwitch = tmp33__ >> 2 & 0x1; + pDst->reserved2 = tmp33__ >> 3 & 0x1; + pDst->psmpCap = tmp33__ >> 4 & 0x1; + pDst->reserved3 = tmp33__ >> 5 & 0x1; + pDst->spsmpCap = tmp33__ >> 6 & 0x1; + pDst->event = tmp33__ >> 7 & 0x1; + tmp34__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->diagnostics = tmp43__ >> 0 & 0x1; - pDst->multiDiagnostics = tmp43__ >> 1 & 0x1; - pDst->locTracking = tmp43__ >> 2 & 0x1; - pDst->FMS = tmp43__ >> 3 & 0x1; - pDst->proxyARPService = tmp43__ >> 4 & 0x1; - pDst->coLocIntfReporting = tmp43__ >> 5 & 0x1; - pDst->civicLoc = tmp43__ >> 6 & 0x1; - pDst->geospatialLoc = tmp43__ >> 7 & 0x1; - - if (!ielen) /* Check to ensure copying of ielen bytes */ - goto endUnpackIeExtCap; - tmp44__ = *pBuf; + pDst->diagnostics = tmp34__ >> 0 & 0x1; + pDst->multiDiagnostics = tmp34__ >> 1 & 0x1; + pDst->locTracking = tmp34__ >> 2 & 0x1; + pDst->FMS = tmp34__ >> 3 & 0x1; + pDst->proxyARPService = tmp34__ >> 4 & 0x1; + pDst->coLocIntfReporting = tmp34__ >> 5 & 0x1; + pDst->civicLoc = tmp34__ >> 6 & 0x1; + pDst->geospatialLoc = tmp34__ >> 7 & 0x1; + tmp35__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->TFS = tmp44__ >> 0 & 0x1; - pDst->wnmSleepMode = tmp44__ >> 1 & 0x1; - pDst->timBroadcast = tmp44__ >> 2 & 0x1; - pDst->bssTransition = tmp44__ >> 3 & 0x1; - pDst->qosTrafficCap = tmp44__ >> 4 & 0x1; - pDst->acStaCnt = tmp44__ >> 5 & 0x1; - pDst->multiBSSID = tmp44__ >> 6 & 0x1; - pDst->timingMeas = tmp44__ >> 7 & 0x1; - - if (!ielen) /* Check to ensure copying of ielen bytes */ - goto endUnpackIeExtCap; - tmp45__ = *pBuf; + pDst->TFS = tmp35__ >> 0 & 0x1; + pDst->wnmSleepMode = tmp35__ >> 1 & 0x1; + pDst->timBroadcast = tmp35__ >> 2 & 0x1; + pDst->bssTransition = tmp35__ >> 3 & 0x1; + pDst->qosTrafficCap = tmp35__ >> 4 & 0x1; + pDst->acStaCnt = tmp35__ >> 5 & 0x1; + pDst->multiBSSID = tmp35__ >> 6 & 0x1; + pDst->timingMeas = tmp35__ >> 7 & 0x1; + tmp36__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->chanUsage = tmp45__ >> 0 & 0x1; - pDst->ssidList = tmp45__ >> 1 & 0x1; - pDst->DMS = tmp45__ >> 2 & 0x1; - pDst->UTCTSFOffset = tmp45__ >> 3 & 0x1; - pDst->TDLSPeerUAPSDBufferSTA = tmp45__ >> 4 & 0x1; - pDst->TDLSPeerPSMSupp = tmp45__ >> 5 & 0x1; - pDst->TDLSChannelSwitching = tmp45__ >> 6 & 0x1; - pDst->interworkingService = tmp45__ >> 7 & 0x1; - - if (!ielen) /* Check to ensure copying of ielen bytes */ - goto endUnpackIeExtCap; - tmp46__ = *pBuf; + pDst->chanUsage = tmp36__ >> 0 & 0x1; + pDst->ssidList = tmp36__ >> 1 & 0x1; + pDst->DMS = tmp36__ >> 2 & 0x1; + pDst->UTCTSFOffset = tmp36__ >> 3 & 0x1; + pDst->TDLSPeerUAPSDBufferSTA = tmp36__ >> 4 & 0x1; + pDst->TDLSPeerPSMSupp = tmp36__ >> 5 & 0x1; + pDst->TDLSChannelSwitching = tmp36__ >> 6 & 0x1; + pDst->interworkingService = tmp36__ >> 7 & 0x1; + tmp37__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->qosMap = tmp46__ >> 0 & 0x1; - pDst->EBR = tmp46__ >> 1 & 0x1; - pDst->sspnInterface = tmp46__ >> 2 & 0x1; - pDst->reserved4 = tmp46__ >> 3 & 0x1; - pDst->msgCFCap = tmp46__ >> 4 & 0x1; - pDst->TDLSSupport = tmp46__ >> 5 & 0x1; - pDst->TDLSProhibited = tmp46__ >> 6 & 0x1; - pDst->TDLSChanSwitProhibited = tmp46__ >> 7 & 0x1; - - if (!ielen) /* Check to ensure copying of ielen bytes */ - goto endUnpackIeExtCap; - tmp47__ = *pBuf; + pDst->qosMap = tmp37__ >> 0 & 0x1; + pDst->EBR = tmp37__ >> 1 & 0x1; + pDst->sspnInterface = tmp37__ >> 2 & 0x1; + pDst->reserved4 = tmp37__ >> 3 & 0x1; + pDst->msgCFCap = tmp37__ >> 4 & 0x1; + pDst->TDLSSupport = tmp37__ >> 5 & 0x1; + pDst->TDLSProhibited = tmp37__ >> 6 & 0x1; + pDst->TDLSChanSwitProhibited = tmp37__ >> 7 & 0x1; + tmp38__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->rejectUnadmittedTraffic = tmp47__ >> 0 & 0x1; - pDst->serviceIntervalGranularity = tmp47__ >> 1 & 0x7; - pDst->identifierLoc = tmp47__ >> 4 & 0x1; - pDst->uapsdCoexistence = tmp47__ >> 5 & 0x1; - pDst->wnmNotification = tmp47__ >> 6 & 0x1; - pDst->QABcapbility = tmp47__ >> 7 & 0x1; - - if (!ielen) /* Check to ensure copying of ielen bytes */ - goto endUnpackIeExtCap; - tmp48__ = *pBuf; + pDst->rejectUnadmittedTraffic = tmp38__ >> 0 & 0x1; + pDst->serviceIntervalGranularity = tmp38__ >> 1 & 0x7; + pDst->identifierLoc = tmp38__ >> 4 & 0x1; + pDst->uapsdCoexistence = tmp38__ >> 5 & 0x1; + pDst->wnmNotification = tmp38__ >> 6 & 0x1; + pDst->QABcapbility = tmp38__ >> 7 & 0x1; + tmp39__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->UTF8SSID = tmp48__ >> 0 & 0x1; - pDst->QMFActivated = tmp48__ >> 1 & 0x1; - pDst->QMFreconAct = tmp48__ >> 2 & 0x1; - pDst->RobustAVStreaming = tmp48__ >> 3 & 0x1; - pDst->AdvancedGCR = tmp48__ >> 4 & 0x1; - pDst->MeshGCR = tmp48__ >> 5 & 0x1; - pDst->SCS = tmp48__ >> 6 & 0x1; - pDst->QLoadReport = tmp48__ >> 7 & 0x1; - - if (!ielen) /* Check to ensure copying of ielen bytes */ - goto endUnpackIeExtCap; - tmp49__ = *pBuf; + pDst->UTF8SSID = tmp39__ >> 0 & 0x1; + pDst->QMFActivated = tmp39__ >> 1 & 0x1; + pDst->QMFreconAct = tmp39__ >> 2 & 0x1; + pDst->RobustAVStreaming = tmp39__ >> 3 & 0x1; + pDst->AdvancedGCR = tmp39__ >> 4 & 0x1; + pDst->MeshGCR = tmp39__ >> 5 & 0x1; + pDst->SCS = tmp39__ >> 6 & 0x1; + pDst->QLoadReport = tmp39__ >> 7 & 0x1; + tmp40__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->AlternateEDCA = tmp49__ >> 0 & 0x1; - pDst->UnprotTXOPneg = tmp49__ >> 1 & 0x1; - pDst->ProtTXOPneg = tmp49__ >> 2 & 0x1; - pDst->reserved6 = tmp49__ >> 3 & 0x1; - pDst->ProtQLoadReport = tmp49__ >> 4 & 0x1; - pDst->TDLSWiderBW = tmp49__ >> 5 & 0x1; - pDst->operModeNotification = tmp49__ >> 6 & 0x1; - pDst->maxNumOfMSDU_bit1 = tmp49__ >> 7 & 0x1; - - if (!ielen) /* Check to ensure copying of ielen bytes */ - goto endUnpackIeExtCap; - tmp50__ = *pBuf; - pDst->maxNumOfMSDU_bit2 = tmp50__ >> 0 & 0x1; - pDst->ChanSchMgmt = tmp50__ >> 1 & 0x1; - pDst->GeoDBInbandEnSignal = tmp50__ >> 2 & 0x1; - pDst->NwChanControl = tmp50__ >> 3 & 0x1; - pDst->WhiteSpaceMap = tmp50__ >> 4 & 0x1; - pDst->ChanAvailQuery = tmp50__ >> 5 & 0x1; - pDst->fineTimingMeas = tmp50__ >> 6 & 0x1; - pDst->reserved7 = tmp50__ >> 7 & 0x1; - -endUnpackIeExtCap: + pDst->AlternateEDCA = tmp40__ >> 0 & 0x1; + pDst->UnprotTXOPneg = tmp40__ >> 1 & 0x1; + pDst->ProtTXOPneg = tmp40__ >> 2 & 0x1; + pDst->reserved6 = tmp40__ >> 3 & 0x1; + pDst->ProtQLoadReport = tmp40__ >> 4 & 0x1; + pDst->TDLSWiderBW = tmp40__ >> 5 & 0x1; + pDst->operModeNotification = tmp40__ >> 6 & 0x1; + pDst->maxNumOfMSDU_bit1 = tmp40__ >> 7 & 0x1; + tmp41__ = *pBuf; + pDst->maxNumOfMSDU_bit2 = tmp41__ >> 0 & 0x1; + pDst->ChanSchMgmt = tmp41__ >> 1 & 0x1; + pDst->GeoDBInbandEnSignal = tmp41__ >> 2 & 0x1; + pDst->NwChanControl = tmp41__ >> 3 & 0x1; + pDst->WhiteSpaceMap = tmp41__ >> 4 & 0x1; + pDst->ChanAvailQuery = tmp41__ >> 5 & 0x1; + pDst->fineTimingMeas = tmp41__ >> 6 & 0x1; + pDst->reserved7 = tmp41__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11fUnpackIeExtCap. */ -#define SigIeExtCap ( 0x003e ) +#define SigIeExtCap ( 0x002c ) -#define SigIeExtChanSwitchAnn ( 0x003f ) +#define SigIeExtChanSwitchAnn ( 0x002d ) tANI_U32 dot11fUnpackIeExtSuppRates(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEExtSuppRates *pDst) @@ -3346,7 +2913,7 @@ tANI_U32 dot11fUnpackIeExtSuppRates(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeExtSuppRates. */ -#define SigIeExtSuppRates ( 0x0040 ) +#define SigIeExtSuppRates ( 0x002e ) tANI_U32 dot11fUnpackIeFHParamSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEFHParamSet *pDst) @@ -3369,7 +2936,7 @@ tANI_U32 dot11fUnpackIeFHParamSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie return status; } /* End dot11fUnpackIeFHParamSet. */ -#define SigIeFHParamSet ( 0x0041 ) +#define SigIeFHParamSet ( 0x002f ) tANI_U32 dot11fUnpackIeFHParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEFHParams *pDst) @@ -3386,7 +2953,7 @@ tANI_U32 dot11fUnpackIeFHParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iele return status; } /* End dot11fUnpackIeFHParams. */ -#define SigIeFHParams ( 0x0042 ) +#define SigIeFHParams ( 0x0030 ) tANI_U32 dot11fUnpackIeFHPattTable(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEFHPattTable *pDst) @@ -3418,7 +2985,7 @@ tANI_U32 dot11fUnpackIeFHPattTable(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeFHPattTable. */ -#define SigIeFHPattTable ( 0x0043 ) +#define SigIeFHPattTable ( 0x0031 ) static const tFFDefn FFS_FTInfo[ ] = { @@ -3436,15 +3003,15 @@ tANI_U32 dot11fUnpackIeFHPattTable(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i tANI_U32 dot11fUnpackIeFTInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEFTInfo *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U16 tmp51__; + tANI_U16 tmp42__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp51__, pBuf, 0); + framesntohs(pCtx, &tmp42__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->reserved = tmp51__ >> 0 & 0xff; - pDst->IECount = tmp51__ >> 8 & 0xff; + pDst->reserved = tmp42__ >> 0 & 0xff; + pDst->IECount = tmp42__ >> 8 & 0xff; DOT11F_MEMCPY(pCtx, pDst->MIC, pBuf, 16); pBuf += 16; ielen -= (tANI_U8)16; @@ -3465,84 +3032,84 @@ tANI_U32 dot11fUnpackIeFTInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeFTInfo. */ -#define SigIeFTInfo ( 0x0044 ) +#define SigIeFTInfo ( 0x0032 ) tANI_U32 dot11fUnpackIeHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEHTCaps *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U16 tmp52__; - tANI_U8 tmp53__; - tANI_U16 tmp54__; - tANI_U32 tmp55__; - tANI_U8 tmp56__; + tANI_U16 tmp43__; + tANI_U8 tmp44__; + tANI_U16 tmp45__; + tANI_U32 tmp46__; + tANI_U8 tmp47__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp52__, pBuf, 0); + framesntohs(pCtx, &tmp43__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->advCodingCap = tmp52__ >> 0 & 0x1; - pDst->supportedChannelWidthSet = tmp52__ >> 1 & 0x1; - pDst->mimoPowerSave = tmp52__ >> 2 & 0x3; - pDst->greenField = tmp52__ >> 4 & 0x1; - pDst->shortGI20MHz = tmp52__ >> 5 & 0x1; - pDst->shortGI40MHz = tmp52__ >> 6 & 0x1; - pDst->txSTBC = tmp52__ >> 7 & 0x1; - pDst->rxSTBC = tmp52__ >> 8 & 0x3; - pDst->delayedBA = tmp52__ >> 10 & 0x1; - pDst->maximalAMSDUsize = tmp52__ >> 11 & 0x1; - pDst->dsssCckMode40MHz = tmp52__ >> 12 & 0x1; - pDst->psmp = tmp52__ >> 13 & 0x1; - pDst->stbcControlFrame = tmp52__ >> 14 & 0x1; - pDst->lsigTXOPProtection = tmp52__ >> 15 & 0x1; - tmp53__ = *pBuf; + pDst->advCodingCap = tmp43__ >> 0 & 0x1; + pDst->supportedChannelWidthSet = tmp43__ >> 1 & 0x1; + pDst->mimoPowerSave = tmp43__ >> 2 & 0x3; + pDst->greenField = tmp43__ >> 4 & 0x1; + pDst->shortGI20MHz = tmp43__ >> 5 & 0x1; + pDst->shortGI40MHz = tmp43__ >> 6 & 0x1; + pDst->txSTBC = tmp43__ >> 7 & 0x1; + pDst->rxSTBC = tmp43__ >> 8 & 0x3; + pDst->delayedBA = tmp43__ >> 10 & 0x1; + pDst->maximalAMSDUsize = tmp43__ >> 11 & 0x1; + pDst->dsssCckMode40MHz = tmp43__ >> 12 & 0x1; + pDst->psmp = tmp43__ >> 13 & 0x1; + pDst->stbcControlFrame = tmp43__ >> 14 & 0x1; + pDst->lsigTXOPProtection = tmp43__ >> 15 & 0x1; + tmp44__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->maxRxAMPDUFactor = tmp53__ >> 0 & 0x3; - pDst->mpduDensity = tmp53__ >> 2 & 0x7; - pDst->reserved1 = tmp53__ >> 5 & 0x7; + pDst->maxRxAMPDUFactor = tmp44__ >> 0 & 0x3; + pDst->mpduDensity = tmp44__ >> 2 & 0x7; + pDst->reserved1 = tmp44__ >> 5 & 0x7; DOT11F_MEMCPY(pCtx, pDst->supportedMCSSet, pBuf, 16); pBuf += 16; ielen -= (tANI_U8)16; - framesntohs(pCtx, &tmp54__, pBuf, 0); + framesntohs(pCtx, &tmp45__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->pco = tmp54__ >> 0 & 0x1; - pDst->transitionTime = tmp54__ >> 1 & 0x3; - pDst->reserved2 = tmp54__ >> 3 & 0x1f; - pDst->mcsFeedback = tmp54__ >> 8 & 0x3; - pDst->reserved3 = tmp54__ >> 10 & 0x3f; - framesntohl(pCtx, &tmp55__, pBuf, 0); + pDst->pco = tmp45__ >> 0 & 0x1; + pDst->transitionTime = tmp45__ >> 1 & 0x3; + pDst->reserved2 = tmp45__ >> 3 & 0x1f; + pDst->mcsFeedback = tmp45__ >> 8 & 0x3; + pDst->reserved3 = tmp45__ >> 10 & 0x3f; + framesntohl(pCtx, &tmp46__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->txBF = tmp55__ >> 0 & 0x1; - pDst->rxStaggeredSounding = tmp55__ >> 1 & 0x1; - pDst->txStaggeredSounding = tmp55__ >> 2 & 0x1; - pDst->rxZLF = tmp55__ >> 3 & 0x1; - pDst->txZLF = tmp55__ >> 4 & 0x1; - pDst->implicitTxBF = tmp55__ >> 5 & 0x1; - pDst->calibration = tmp55__ >> 6 & 0x3; - pDst->explicitCSITxBF = tmp55__ >> 8 & 0x1; - pDst->explicitUncompressedSteeringMatrix = tmp55__ >> 9 & 0x1; - pDst->explicitBFCSIFeedback = tmp55__ >> 10 & 0x7; - pDst->explicitUncompressedSteeringMatrixFeedback = tmp55__ >> 13 & 0x7; - pDst->explicitCompressedSteeringMatrixFeedback = tmp55__ >> 16 & 0x7; - pDst->csiNumBFAntennae = tmp55__ >> 19 & 0x3; - pDst->uncompressedSteeringMatrixBFAntennae = tmp55__ >> 21 & 0x3; - pDst->compressedSteeringMatrixBFAntennae = tmp55__ >> 23 & 0x3; - pDst->reserved4 = tmp55__ >> 25 & 0x7f; - tmp56__ = *pBuf; + pDst->txBF = tmp46__ >> 0 & 0x1; + pDst->rxStaggeredSounding = tmp46__ >> 1 & 0x1; + pDst->txStaggeredSounding = tmp46__ >> 2 & 0x1; + pDst->rxZLF = tmp46__ >> 3 & 0x1; + pDst->txZLF = tmp46__ >> 4 & 0x1; + pDst->implicitTxBF = tmp46__ >> 5 & 0x1; + pDst->calibration = tmp46__ >> 6 & 0x3; + pDst->explicitCSITxBF = tmp46__ >> 8 & 0x1; + pDst->explicitUncompressedSteeringMatrix = tmp46__ >> 9 & 0x1; + pDst->explicitBFCSIFeedback = tmp46__ >> 10 & 0x7; + pDst->explicitUncompressedSteeringMatrixFeedback = tmp46__ >> 13 & 0x7; + pDst->explicitCompressedSteeringMatrixFeedback = tmp46__ >> 16 & 0x7; + pDst->csiNumBFAntennae = tmp46__ >> 19 & 0x3; + pDst->uncompressedSteeringMatrixBFAntennae = tmp46__ >> 21 & 0x3; + pDst->compressedSteeringMatrixBFAntennae = tmp46__ >> 23 & 0x3; + pDst->reserved4 = tmp46__ >> 25 & 0x7f; + tmp47__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->antennaSelection = tmp56__ >> 0 & 0x1; - pDst->explicitCSIFeedbackTx = tmp56__ >> 1 & 0x1; - pDst->antennaIndicesFeedbackTx = tmp56__ >> 2 & 0x1; - pDst->explicitCSIFeedback = tmp56__ >> 3 & 0x1; - pDst->antennaIndicesFeedback = tmp56__ >> 4 & 0x1; - pDst->rxAS = tmp56__ >> 5 & 0x1; - pDst->txSoundingPPDUs = tmp56__ >> 6 & 0x1; - pDst->reserved5 = tmp56__ >> 7 & 0x1; + pDst->antennaSelection = tmp47__ >> 0 & 0x1; + pDst->explicitCSIFeedbackTx = tmp47__ >> 1 & 0x1; + pDst->antennaIndicesFeedbackTx = tmp47__ >> 2 & 0x1; + pDst->explicitCSIFeedback = tmp47__ >> 3 & 0x1; + pDst->antennaIndicesFeedback = tmp47__ >> 4 & 0x1; + pDst->rxAS = tmp47__ >> 5 & 0x1; + pDst->txSoundingPPDUs = tmp47__ >> 6 & 0x1; + pDst->reserved5 = tmp47__ >> 7 & 0x1; pDst->num_rsvd = (tANI_U8)( ielen ); if (ielen > 32){ pDst->present = 0; @@ -3554,47 +3121,47 @@ tANI_U32 dot11fUnpackIeHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeHTCaps. */ -#define SigIeHTCaps ( 0x0045 ) +#define SigIeHTCaps ( 0x0033 ) tANI_U32 dot11fUnpackIeHTInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEHTInfo *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp57__; - tANI_U16 tmp58__; - tANI_U16 tmp59__; + tANI_U8 tmp48__; + tANI_U16 tmp49__; + tANI_U16 tmp50__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; pDst->primaryChannel = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; - tmp57__ = *pBuf; + tmp48__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->secondaryChannelOffset = tmp57__ >> 0 & 0x3; - pDst->recommendedTxWidthSet = tmp57__ >> 2 & 0x1; - pDst->rifsMode = tmp57__ >> 3 & 0x1; - pDst->controlledAccessOnly = tmp57__ >> 4 & 0x1; - pDst->serviceIntervalGranularity = tmp57__ >> 5 & 0x7; - framesntohs(pCtx, &tmp58__, pBuf, 0); + pDst->secondaryChannelOffset = tmp48__ >> 0 & 0x3; + pDst->recommendedTxWidthSet = tmp48__ >> 2 & 0x1; + pDst->rifsMode = tmp48__ >> 3 & 0x1; + pDst->controlledAccessOnly = tmp48__ >> 4 & 0x1; + pDst->serviceIntervalGranularity = tmp48__ >> 5 & 0x7; + framesntohs(pCtx, &tmp49__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->opMode = tmp58__ >> 0 & 0x3; - pDst->nonGFDevicesPresent = tmp58__ >> 2 & 0x1; - pDst->transmitBurstLimit = tmp58__ >> 3 & 0x1; - pDst->obssNonHTStaPresent = tmp58__ >> 4 & 0x1; - pDst->reserved = tmp58__ >> 5 & 0x7ff; - framesntohs(pCtx, &tmp59__, pBuf, 0); + pDst->opMode = tmp49__ >> 0 & 0x3; + pDst->nonGFDevicesPresent = tmp49__ >> 2 & 0x1; + pDst->transmitBurstLimit = tmp49__ >> 3 & 0x1; + pDst->obssNonHTStaPresent = tmp49__ >> 4 & 0x1; + pDst->reserved = tmp49__ >> 5 & 0x7ff; + framesntohs(pCtx, &tmp50__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->basicSTBCMCS = tmp59__ >> 0 & 0x7f; - pDst->dualCTSProtection = tmp59__ >> 7 & 0x1; - pDst->secondaryBeacon = tmp59__ >> 8 & 0x1; - pDst->lsigTXOPProtectionFullSupport = tmp59__ >> 9 & 0x1; - pDst->pcoActive = tmp59__ >> 10 & 0x1; - pDst->pcoPhase = tmp59__ >> 11 & 0x1; - pDst->reserved2 = tmp59__ >> 12 & 0xf; + pDst->basicSTBCMCS = tmp50__ >> 0 & 0x7f; + pDst->dualCTSProtection = tmp50__ >> 7 & 0x1; + pDst->secondaryBeacon = tmp50__ >> 8 & 0x1; + pDst->lsigTXOPProtectionFullSupport = tmp50__ >> 9 & 0x1; + pDst->pcoActive = tmp50__ >> 10 & 0x1; + pDst->pcoPhase = tmp50__ >> 11 & 0x1; + pDst->reserved2 = tmp50__ >> 12 & 0xf; DOT11F_MEMCPY(pCtx, pDst->basicMCSSet, pBuf, 16); pBuf += 16; ielen -= (tANI_U8)16; @@ -3609,7 +3176,7 @@ tANI_U32 dot11fUnpackIeHTInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeHTInfo. */ -#define SigIeHTInfo ( 0x0046 ) +#define SigIeHTInfo ( 0x0034 ) tANI_U32 dot11fUnpackIeIBSSParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEIBSSParams *pDst) @@ -3623,7 +3190,7 @@ tANI_U32 dot11fUnpackIeIBSSParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie return status; } /* End dot11fUnpackIeIBSSParams. */ -#define SigIeIBSSParams ( 0x0047 ) +#define SigIeIBSSParams ( 0x0035 ) tANI_U32 dot11fUnpackIeLinkIdentifier(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIELinkIdentifier *pDst) @@ -3643,7 +3210,7 @@ tANI_U32 dot11fUnpackIeLinkIdentifier(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U return status; } /* End dot11fUnpackIeLinkIdentifier. */ -#define SigIeLinkIdentifier ( 0x0048 ) +#define SigIeLinkIdentifier ( 0x0036 ) static const tFFDefn FFS_reportBeacon[ ] = { @@ -3658,22 +3225,22 @@ static const tIEDefn IES_reportBeacon[ ] = { tANI_U32 dot11fUnpackIeMeasurementReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEMeasurementReport *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp60__; - tANI_U8 tmp61__; - tANI_U8 tmp62__; + tANI_U8 tmp51__; + tANI_U8 tmp52__; + tANI_U8 tmp53__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; pDst->token = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; - tmp60__ = *pBuf; + tmp51__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->late = tmp60__ >> 0 & 0x1; - pDst->incapable = tmp60__ >> 1 & 0x1; - pDst->refused = tmp60__ >> 2 & 0x1; - pDst->unused = tmp60__ >> 3 & 0x1f; + pDst->late = tmp51__ >> 0 & 0x1; + pDst->incapable = tmp51__ >> 1 & 0x1; + pDst->refused = tmp51__ >> 2 & 0x1; + pDst->unused = tmp51__ >> 3 & 0x1f; pDst->type = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; @@ -3695,15 +3262,15 @@ tANI_U32 dot11fUnpackIeMeasurementReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tAN framesntohs(pCtx, &pDst->report.Basic.meas_duration, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp61__ = *pBuf; + tmp52__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->report.Basic.bss = tmp61__ >> 0 & 0x1; - pDst->report.Basic.ofdm_preamble = tmp61__ >> 1 & 0x1; - pDst->report.Basic.unid_signal = tmp61__ >> 2 & 0x1; - pDst->report.Basic.rader = tmp61__ >> 3 & 0x1; - pDst->report.Basic.unmeasured = tmp61__ >> 4 & 0x1; - pDst->report.Basic.unused = tmp61__ >> 5 & 0x7; + pDst->report.Basic.bss = tmp52__ >> 0 & 0x1; + pDst->report.Basic.ofdm_preamble = tmp52__ >> 1 & 0x1; + pDst->report.Basic.unid_signal = tmp52__ >> 2 & 0x1; + pDst->report.Basic.rader = tmp52__ >> 3 & 0x1; + pDst->report.Basic.unmeasured = tmp52__ >> 4 & 0x1; + pDst->report.Basic.unused = tmp52__ >> 5 & 0x7; break; case 1: pDst->report.CCA.channel = *pBuf; @@ -3767,11 +3334,11 @@ tANI_U32 dot11fUnpackIeMeasurementReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tAN framesntohs(pCtx, &pDst->report.Beacon.meas_duration, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp62__ = *pBuf; + tmp53__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->report.Beacon.condensed_PHY = tmp62__ >> 0 & 0x7f; - pDst->report.Beacon.reported_frame_type = tmp62__ >> 7 & 0x1; + pDst->report.Beacon.condensed_PHY = tmp53__ >> 0 & 0x7f; + pDst->report.Beacon.reported_frame_type = tmp53__ >> 7 & 0x1; pDst->report.Beacon.RCPI = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; @@ -3801,7 +3368,7 @@ tANI_U32 dot11fUnpackIeMeasurementReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tAN return status; } /* End dot11fUnpackIeMeasurementReport. */ -#define SigIeMeasurementReport ( 0x0049 ) +#define SigIeMeasurementReport ( 0x0037 ) static const tFFDefn FFS_measurement_requestBeacon[ ] = { @@ -3820,22 +3387,22 @@ static const tIEDefn IES_measurement_requestBeacon[ ] = { tANI_U32 dot11fUnpackIeMeasurementRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEMeasurementRequest *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp63__; + tANI_U8 tmp54__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; pDst->measurement_token = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; - tmp63__ = *pBuf; + tmp54__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->parallel = tmp63__ >> 0 & 0x1; - pDst->enable = tmp63__ >> 1 & 0x1; - pDst->request = tmp63__ >> 2 & 0x1; - pDst->report = tmp63__ >> 3 & 0x1; - pDst->durationMandatory = tmp63__ >> 4 & 0x1; - pDst->unused = tmp63__ >> 5 & 0x7; + pDst->parallel = tmp54__ >> 0 & 0x1; + pDst->enable = tmp54__ >> 1 & 0x1; + pDst->request = tmp54__ >> 2 & 0x1; + pDst->report = tmp54__ >> 3 & 0x1; + pDst->durationMandatory = tmp54__ >> 4 & 0x1; + pDst->unused = tmp54__ >> 5 & 0x7; pDst->measurement_type = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; @@ -3906,28 +3473,28 @@ tANI_U32 dot11fUnpackIeMeasurementRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tA return status; } /* End dot11fUnpackIeMeasurementRequest. */ -#define SigIeMeasurementRequest ( 0x004a ) +#define SigIeMeasurementRequest ( 0x0038 ) tANI_U32 dot11fUnpackIeMobilityDomain(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEMobilityDomain *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp64__; + tANI_U8 tmp55__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; framesntohs(pCtx, &pDst->MDID, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp64__ = *pBuf; - pDst->overDSCap = tmp64__ >> 0 & 0x1; - pDst->resourceReqCap = tmp64__ >> 1 & 0x1; - pDst->reserved = tmp64__ >> 2 & 0x3f; + tmp55__ = *pBuf; + pDst->overDSCap = tmp55__ >> 0 & 0x1; + pDst->resourceReqCap = tmp55__ >> 1 & 0x1; + pDst->reserved = tmp55__ >> 2 & 0x3f; (void)pCtx; return status; } /* End dot11fUnpackIeMobilityDomain. */ -#define SigIeMobilityDomain ( 0x004b ) +#define SigIeMobilityDomain ( 0x0039 ) static const tFFDefn FFS_NeighborReport[ ] = { @@ -3946,31 +3513,31 @@ tANI_U32 dot11fUnpackIeMobilityDomain(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U tANI_U32 dot11fUnpackIeNeighborReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIENeighborReport *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp65__; - tANI_U8 tmp66__; + tANI_U8 tmp56__; + tANI_U8 tmp57__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; DOT11F_MEMCPY(pCtx, pDst->bssid, pBuf, 6); pBuf += 6; ielen -= (tANI_U8)6; - tmp65__ = *pBuf; + tmp56__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->APReachability = tmp65__ >> 0 & 0x3; - pDst->Security = tmp65__ >> 2 & 0x1; - pDst->KeyScope = tmp65__ >> 3 & 0x1; - pDst->SpecMgmtCap = tmp65__ >> 4 & 0x1; - pDst->QosCap = tmp65__ >> 5 & 0x1; - pDst->apsd = tmp65__ >> 6 & 0x1; - pDst->rrm = tmp65__ >> 7 & 0x1; - tmp66__ = *pBuf; + pDst->APReachability = tmp56__ >> 0 & 0x3; + pDst->Security = tmp56__ >> 2 & 0x1; + pDst->KeyScope = tmp56__ >> 3 & 0x1; + pDst->SpecMgmtCap = tmp56__ >> 4 & 0x1; + pDst->QosCap = tmp56__ >> 5 & 0x1; + pDst->apsd = tmp56__ >> 6 & 0x1; + pDst->rrm = tmp56__ >> 7 & 0x1; + tmp57__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->DelayedBA = tmp66__ >> 0 & 0x1; - pDst->ImmBA = tmp66__ >> 1 & 0x1; - pDst->MobilityDomain = tmp66__ >> 2 & 0x1; - pDst->reserved = tmp66__ >> 3 & 0x1f; + pDst->DelayedBA = tmp57__ >> 0 & 0x1; + pDst->ImmBA = tmp57__ >> 1 & 0x1; + pDst->MobilityDomain = tmp57__ >> 2 & 0x1; + pDst->reserved = tmp57__ >> 3 & 0x1f; framesntohs(pCtx, &pDst->reserved1, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; @@ -3994,7 +3561,7 @@ tANI_U32 dot11fUnpackIeNeighborReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U return status; } /* End dot11fUnpackIeNeighborReport. */ -#define SigIeNeighborReport ( 0x004c ) +#define SigIeNeighborReport ( 0x003a ) tANI_U32 dot11fUnpackIeOBSSScanParameters(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEOBSSScanParameters *pDst) @@ -4026,26 +3593,26 @@ tANI_U32 dot11fUnpackIeOBSSScanParameters(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tA return status; } /* End dot11fUnpackIeOBSSScanParameters. */ -#define SigIeOBSSScanParameters ( 0x004d ) +#define SigIeOBSSScanParameters ( 0x003b ) tANI_U32 dot11fUnpackIeOperatingMode(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEOperatingMode *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp67__; + tANI_U8 tmp58__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp67__ = *pBuf; - pDst->chanWidth = tmp67__ >> 0 & 0x3; - pDst->reserved = tmp67__ >> 2 & 0x3; - pDst->rxNSS = tmp67__ >> 4 & 0x7; - pDst->rxNSSType = tmp67__ >> 7 & 0x1; + tmp58__ = *pBuf; + pDst->chanWidth = tmp58__ >> 0 & 0x3; + pDst->reserved = tmp58__ >> 2 & 0x3; + pDst->rxNSS = tmp58__ >> 4 & 0x7; + pDst->rxNSSType = tmp58__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11fUnpackIeOperatingMode. */ -#define SigIeOperatingMode ( 0x004e ) +#define SigIeOperatingMode ( 0x003c ) static const tTLVDefn TLVS_P2PAssocReq[ ] = { @@ -4064,7 +3631,7 @@ tANI_U32 dot11fUnpackIeP2PAssocReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeP2PAssocReq. */ -#define SigIeP2PAssocReq ( 0x004f ) +#define SigIeP2PAssocReq ( 0x003d ) static const tTLVDefn TLVS_P2PAssocRes[ ] = { @@ -4082,7 +3649,7 @@ tANI_U32 dot11fUnpackIeP2PAssocRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeP2PAssocRes. */ -#define SigIeP2PAssocRes ( 0x0050 ) +#define SigIeP2PAssocRes ( 0x003e ) static const tTLVDefn TLVS_P2PBeacon[ ] = { @@ -4101,7 +3668,7 @@ tANI_U32 dot11fUnpackIeP2PBeacon(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeP2PBeacon. */ -#define SigIeP2PBeacon ( 0x0051 ) +#define SigIeP2PBeacon ( 0x003f ) static const tTLVDefn TLVS_P2PBeaconProbeRes[ ] = { @@ -4123,7 +3690,7 @@ tANI_U32 dot11fUnpackIeP2PBeaconProbeRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tAN return status; } /* End dot11fUnpackIeP2PBeaconProbeRes. */ -#define SigIeP2PBeaconProbeRes ( 0x0052 ) +#define SigIeP2PBeaconProbeRes ( 0x0040 ) static const tTLVDefn TLVS_P2PDeAuth[ ] = { @@ -4140,7 +3707,7 @@ tANI_U32 dot11fUnpackIeP2PDeAuth(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeP2PDeAuth. */ -#define SigIeP2PDeAuth ( 0x0053 ) +#define SigIeP2PDeAuth ( 0x0041 ) static const tTLVDefn TLVS_P2PDeviceDiscoverabilityReq[ ] = { @@ -4158,7 +3725,7 @@ tANI_U32 dot11fUnpackIeP2PDeviceDiscoverabilityReq(tpAniSirGlobal pCtx, tANI_U8 return status; } /* End dot11fUnpackIeP2PDeviceDiscoverabilityReq. */ -#define SigIeP2PDeviceDiscoverabilityReq ( 0x0054 ) +#define SigIeP2PDeviceDiscoverabilityReq ( 0x0042 ) static const tTLVDefn TLVS_P2PDeviceDiscoverabilityRes[ ] = { @@ -4175,7 +3742,7 @@ tANI_U32 dot11fUnpackIeP2PDeviceDiscoverabilityRes(tpAniSirGlobal pCtx, tANI_U8 return status; } /* End dot11fUnpackIeP2PDeviceDiscoverabilityRes. */ -#define SigIeP2PDeviceDiscoverabilityRes ( 0x0055 ) +#define SigIeP2PDeviceDiscoverabilityRes ( 0x0043 ) static const tTLVDefn TLVS_P2PDisAssoc[ ] = { @@ -4192,7 +3759,7 @@ tANI_U32 dot11fUnpackIeP2PDisAssoc(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeP2PDisAssoc. */ -#define SigIeP2PDisAssoc ( 0x0056 ) +#define SigIeP2PDisAssoc ( 0x0044 ) static const tTLVDefn TLVS_P2PGONegCnf[ ] = { @@ -4213,7 +3780,7 @@ tANI_U32 dot11fUnpackIeP2PGONegCnf(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeP2PGONegCnf. */ -#define SigIeP2PGONegCnf ( 0x0057 ) +#define SigIeP2PGONegCnf ( 0x0045 ) static const tTLVDefn TLVS_P2PGONegReq[ ] = { @@ -4238,7 +3805,7 @@ tANI_U32 dot11fUnpackIeP2PGONegReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeP2PGONegReq. */ -#define SigIeP2PGONegReq ( 0x0058 ) +#define SigIeP2PGONegReq ( 0x0046 ) static const tTLVDefn TLVS_P2PGONegRes[ ] = { @@ -4263,7 +3830,7 @@ tANI_U32 dot11fUnpackIeP2PGONegRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeP2PGONegRes. */ -#define SigIeP2PGONegRes ( 0x0059 ) +#define SigIeP2PGONegRes ( 0x0047 ) static const tTLVDefn TLVS_P2PGONegWPS[ ] = { @@ -4281,7 +3848,7 @@ tANI_U32 dot11fUnpackIeP2PGONegWPS(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeP2PGONegWPS. */ -#define SigIeP2PGONegWPS ( 0x005a ) +#define SigIeP2PGONegWPS ( 0x0048 ) tANI_U32 dot11fUnpackIeP2PIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEP2PIEOpaque *pDst) @@ -4301,7 +3868,7 @@ tANI_U32 dot11fUnpackIeP2PIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeP2PIEOpaque. */ -#define SigIeP2PIEOpaque ( 0x005b ) +#define SigIeP2PIEOpaque ( 0x0049 ) static const tTLVDefn TLVS_P2PInvitationReq[ ] = { @@ -4324,7 +3891,7 @@ tANI_U32 dot11fUnpackIeP2PInvitationReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI return status; } /* End dot11fUnpackIeP2PInvitationReq. */ -#define SigIeP2PInvitationReq ( 0x005c ) +#define SigIeP2PInvitationReq ( 0x004a ) static const tTLVDefn TLVS_P2PInvitationRes[ ] = { @@ -4345,7 +3912,7 @@ tANI_U32 dot11fUnpackIeP2PInvitationRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI return status; } /* End dot11fUnpackIeP2PInvitationRes. */ -#define SigIeP2PInvitationRes ( 0x005d ) +#define SigIeP2PInvitationRes ( 0x004b ) static const tTLVDefn TLVS_P2PNoticeOfAbsence[ ] = { @@ -4362,7 +3929,7 @@ tANI_U32 dot11fUnpackIeP2PNoticeOfAbsence(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tA return status; } /* End dot11fUnpackIeP2PNoticeOfAbsence. */ -#define SigIeP2PNoticeOfAbsence ( 0x005e ) +#define SigIeP2PNoticeOfAbsence ( 0x004c ) static const tTLVDefn TLVS_P2PPresenceResponse[ ] = { @@ -4380,7 +3947,7 @@ tANI_U32 dot11fUnpackIeP2PPresenceResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, t return status; } /* End dot11fUnpackIeP2PPresenceResponse. */ -#define SigIeP2PPresenceResponse ( 0x005f ) +#define SigIeP2PPresenceResponse ( 0x004d ) static const tTLVDefn TLVS_P2PProbeReq[ ] = { @@ -4401,7 +3968,7 @@ tANI_U32 dot11fUnpackIeP2PProbeReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeP2PProbeReq. */ -#define SigIeP2PProbeReq ( 0x0060 ) +#define SigIeP2PProbeReq ( 0x004e ) static const tTLVDefn TLVS_P2PProbeRes[ ] = { @@ -4422,7 +3989,7 @@ tANI_U32 dot11fUnpackIeP2PProbeRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeP2PProbeRes. */ -#define SigIeP2PProbeRes ( 0x0061 ) +#define SigIeP2PProbeRes ( 0x004f ) static const tTLVDefn TLVS_P2PProvisionDiscoveryReq[ ] = { @@ -4441,7 +4008,7 @@ tANI_U32 dot11fUnpackIeP2PProvisionDiscoveryReq(tpAniSirGlobal pCtx, tANI_U8 *pB return status; } /* End dot11fUnpackIeP2PProvisionDiscoveryReq. */ -#define SigIeP2PProvisionDiscoveryReq ( 0x0062 ) +#define SigIeP2PProvisionDiscoveryReq ( 0x0050 ) static const tTLVDefn TLVS_P2PWSCProvisionDiscoveryRes[ ] = { @@ -4458,7 +4025,7 @@ tANI_U32 dot11fUnpackIeP2PWSCProvisionDiscoveryRes(tpAniSirGlobal pCtx, tANI_U8 return status; } /* End dot11fUnpackIeP2PWSCProvisionDiscoveryRes. */ -#define SigIeP2PWSCProvisionDiscoveryRes ( 0x0063 ) +#define SigIeP2PWSCProvisionDiscoveryRes ( 0x0051 ) tANI_U32 dot11fUnpackIePTIControl(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPTIControl *pDst) @@ -4475,27 +4042,27 @@ tANI_U32 dot11fUnpackIePTIControl(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie return status; } /* End dot11fUnpackIePTIControl. */ -#define SigIePTIControl ( 0x0064 ) +#define SigIePTIControl ( 0x0052 ) tANI_U32 dot11fUnpackIePUBufferStatus(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPUBufferStatus *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp68__; + tANI_U8 tmp59__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp68__ = *pBuf; - pDst->ac_bk_traffic_aval = tmp68__ >> 0 & 0x1; - pDst->ac_be_traffic_aval = tmp68__ >> 1 & 0x1; - pDst->ac_vi_traffic_aval = tmp68__ >> 2 & 0x1; - pDst->ac_vo_traffic_aval = tmp68__ >> 3 & 0x1; - pDst->reserved = tmp68__ >> 4 & 0xf; + tmp59__ = *pBuf; + pDst->ac_bk_traffic_aval = tmp59__ >> 0 & 0x1; + pDst->ac_be_traffic_aval = tmp59__ >> 1 & 0x1; + pDst->ac_vi_traffic_aval = tmp59__ >> 2 & 0x1; + pDst->ac_vo_traffic_aval = tmp59__ >> 3 & 0x1; + pDst->reserved = tmp59__ >> 4 & 0xf; (void)pCtx; return status; } /* End dot11fUnpackIePUBufferStatus. */ -#define SigIePUBufferStatus ( 0x0065 ) +#define SigIePUBufferStatus ( 0x0053 ) tANI_U32 dot11fUnpackIePowerCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPowerCaps *pDst) @@ -4512,7 +4079,7 @@ tANI_U32 dot11fUnpackIePowerCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIePowerCaps. */ -#define SigIePowerCaps ( 0x0066 ) +#define SigIePowerCaps ( 0x0054 ) tANI_U32 dot11fUnpackIePowerConstraints(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPowerConstraints *pDst) @@ -4526,7 +4093,7 @@ tANI_U32 dot11fUnpackIePowerConstraints(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI return status; } /* End dot11fUnpackIePowerConstraints. */ -#define SigIePowerConstraints ( 0x0067 ) +#define SigIePowerConstraints ( 0x0055 ) tANI_U32 dot11fUnpackIeQBSSLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQBSSLoad *pDst) @@ -4546,49 +4113,49 @@ tANI_U32 dot11fUnpackIeQBSSLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iele return status; } /* End dot11fUnpackIeQBSSLoad. */ -#define SigIeQBSSLoad ( 0x0068 ) +#define SigIeQBSSLoad ( 0x0056 ) tANI_U32 dot11fUnpackIeQOSCapsAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQOSCapsAp *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp69__; + tANI_U8 tmp60__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp69__ = *pBuf; - pDst->count = tmp69__ >> 0 & 0xf; - pDst->qack = tmp69__ >> 4 & 0x1; - pDst->qreq = tmp69__ >> 5 & 0x1; - pDst->txopreq = tmp69__ >> 6 & 0x1; - pDst->reserved = tmp69__ >> 7 & 0x1; + tmp60__ = *pBuf; + pDst->count = tmp60__ >> 0 & 0xf; + pDst->qack = tmp60__ >> 4 & 0x1; + pDst->qreq = tmp60__ >> 5 & 0x1; + pDst->txopreq = tmp60__ >> 6 & 0x1; + pDst->reserved = tmp60__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11fUnpackIeQOSCapsAp. */ -#define SigIeQOSCapsAp ( 0x0069 ) +#define SigIeQOSCapsAp ( 0x0057 ) tANI_U32 dot11fUnpackIeQOSCapsStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQOSCapsStation *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp70__; + tANI_U8 tmp61__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp70__ = *pBuf; - pDst->acvo_uapsd = tmp70__ >> 0 & 0x1; - pDst->acvi_uapsd = tmp70__ >> 1 & 0x1; - pDst->acbk_uapsd = tmp70__ >> 2 & 0x1; - pDst->acbe_uapsd = tmp70__ >> 3 & 0x1; - pDst->qack = tmp70__ >> 4 & 0x1; - pDst->max_sp_length = tmp70__ >> 5 & 0x3; - pDst->more_data_ack = tmp70__ >> 7 & 0x1; + tmp61__ = *pBuf; + pDst->acvo_uapsd = tmp61__ >> 0 & 0x1; + pDst->acvi_uapsd = tmp61__ >> 1 & 0x1; + pDst->acbk_uapsd = tmp61__ >> 2 & 0x1; + pDst->acbe_uapsd = tmp61__ >> 3 & 0x1; + pDst->qack = tmp61__ >> 4 & 0x1; + pDst->max_sp_length = tmp61__ >> 5 & 0x3; + pDst->more_data_ack = tmp61__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11fUnpackIeQOSCapsStation. */ -#define SigIeQOSCapsStation ( 0x006a ) +#define SigIeQOSCapsStation ( 0x0058 ) tANI_U32 dot11fUnpackIeQosMapSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQosMapSet *pDst) @@ -4608,7 +4175,7 @@ tANI_U32 dot11fUnpackIeQosMapSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeQosMapSet. */ -#define SigIeQosMapSet ( 0x006b ) +#define SigIeQosMapSet ( 0x0059 ) tANI_U32 dot11fUnpackIeQuiet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQuiet *pDst) @@ -4631,7 +4198,7 @@ tANI_U32 dot11fUnpackIeQuiet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeQuiet. */ -#define SigIeQuiet ( 0x006c ) +#define SigIeQuiet ( 0x005a ) tANI_U32 dot11fUnpackIeRCPIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERCPIIE *pDst) @@ -4645,7 +4212,7 @@ tANI_U32 dot11fUnpackIeRCPIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeRCPIIE. */ -#define SigIeRCPIIE ( 0x006d ) +#define SigIeRCPIIE ( 0x005b ) static const tFFDefn FFS_RICDataDesc[ ] = { @@ -4685,7 +4252,7 @@ tANI_U32 dot11fUnpackIeRICDataDesc(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeRICDataDesc. */ -#define SigIeRICDataDesc ( 0x006e ) +#define SigIeRICDataDesc ( 0x005c ) tANI_U32 dot11fUnpackIeRSN(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSN *pDst) @@ -4788,7 +4355,7 @@ tANI_U32 dot11fUnpackIeRSN(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tD return status; } /* End dot11fUnpackIeRSN. */ -#define SigIeRSN ( 0x006f ) +#define SigIeRSN ( 0x005d ) tANI_U32 dot11fUnpackIeRSNIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSNIIE *pDst) @@ -4802,7 +4369,7 @@ tANI_U32 dot11fUnpackIeRSNIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeRSNIIE. */ -#define SigIeRSNIIE ( 0x0070 ) +#define SigIeRSNIIE ( 0x005e ) tANI_U32 dot11fUnpackIeRSNOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSNOpaque *pDst) @@ -4822,7 +4389,7 @@ tANI_U32 dot11fUnpackIeRSNOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeRSNOpaque. */ -#define SigIeRSNOpaque ( 0x0071 ) +#define SigIeRSNOpaque ( 0x005f ) tANI_U32 dot11fUnpackIeSuppChannels(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppChannels *pDst) @@ -4842,7 +4409,7 @@ tANI_U32 dot11fUnpackIeSuppChannels(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeSuppChannels. */ -#define SigIeSuppChannels ( 0x0072 ) +#define SigIeSuppChannels ( 0x0060 ) tANI_U32 dot11fUnpackIeSuppOperatingClasses(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppOperatingClasses *pDst) @@ -4862,7 +4429,7 @@ tANI_U32 dot11fUnpackIeSuppOperatingClasses(tpAniSirGlobal pCtx, tANI_U8 *pBuf, return status; } /* End dot11fUnpackIeSuppOperatingClasses. */ -#define SigIeSuppOperatingClasses ( 0x0073 ) +#define SigIeSuppOperatingClasses ( 0x0061 ) tANI_U32 dot11fUnpackIeSuppRates(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppRates *pDst) @@ -4890,7 +4457,7 @@ tANI_U32 dot11fUnpackIeSuppRates(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeSuppRates. */ -#define SigIeSuppRates ( 0x0074 ) +#define SigIeSuppRates ( 0x0062 ) tANI_U32 dot11fUnpackIeTIM(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETIM *pDst) @@ -4919,7 +4486,7 @@ tANI_U32 dot11fUnpackIeTIM(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tD return status; } /* End dot11fUnpackIeTIM. */ -#define SigIeTIM ( 0x0075 ) +#define SigIeTIM ( 0x0063 ) tANI_U32 dot11fUnpackIeTPCReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETPCReport *pDst) @@ -4936,7 +4503,7 @@ tANI_U32 dot11fUnpackIeTPCReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeTPCReport. */ -#define SigIeTPCReport ( 0x0076 ) +#define SigIeTPCReport ( 0x0064 ) tANI_U32 dot11fUnpackIeTPCRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETPCRequest *pDst) @@ -4949,7 +4516,7 @@ tANI_U32 dot11fUnpackIeTPCRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie return status; } /* End dot11fUnpackIeTPCRequest. */ -#define SigIeTPCRequest ( 0x0077 ) +#define SigIeTPCRequest ( 0x0065 ) tANI_U32 dot11fUnpackIeTimeoutInterval(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETimeoutInterval *pDst) @@ -4966,60 +4533,60 @@ tANI_U32 dot11fUnpackIeTimeoutInterval(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_ return status; } /* End dot11fUnpackIeTimeoutInterval. */ -#define SigIeTimeoutInterval ( 0x0078 ) +#define SigIeTimeoutInterval ( 0x0066 ) tANI_U32 dot11fUnpackIeVHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTCaps *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U32 tmp71__; - tANI_U16 tmp72__; - tANI_U16 tmp73__; + tANI_U32 tmp62__; + tANI_U16 tmp63__; + tANI_U16 tmp64__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohl(pCtx, &tmp71__, pBuf, 0); + framesntohl(pCtx, &tmp62__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->maxMPDULen = tmp71__ >> 0 & 0x3; - pDst->supportedChannelWidthSet = tmp71__ >> 2 & 0x3; - pDst->ldpcCodingCap = tmp71__ >> 4 & 0x1; - pDst->shortGI80MHz = tmp71__ >> 5 & 0x1; - pDst->shortGI160and80plus80MHz = tmp71__ >> 6 & 0x1; - pDst->txSTBC = tmp71__ >> 7 & 0x1; - pDst->rxSTBC = tmp71__ >> 8 & 0x7; - pDst->suBeamFormerCap = tmp71__ >> 11 & 0x1; - pDst->suBeamformeeCap = tmp71__ >> 12 & 0x1; - pDst->csnofBeamformerAntSup = tmp71__ >> 13 & 0x7; - pDst->numSoundingDim = tmp71__ >> 16 & 0x7; - pDst->muBeamformerCap = tmp71__ >> 19 & 0x1; - pDst->muBeamformeeCap = tmp71__ >> 20 & 0x1; - pDst->vhtTXOPPS = tmp71__ >> 21 & 0x1; - pDst->htcVHTCap = tmp71__ >> 22 & 0x1; - pDst->maxAMPDULenExp = tmp71__ >> 23 & 0x7; - pDst->vhtLinkAdaptCap = tmp71__ >> 26 & 0x3; - pDst->rxAntPattern = tmp71__ >> 28 & 0x1; - pDst->txAntPattern = tmp71__ >> 29 & 0x1; - pDst->reserved1 = tmp71__ >> 30 & 0x3; + pDst->maxMPDULen = tmp62__ >> 0 & 0x3; + pDst->supportedChannelWidthSet = tmp62__ >> 2 & 0x3; + pDst->ldpcCodingCap = tmp62__ >> 4 & 0x1; + pDst->shortGI80MHz = tmp62__ >> 5 & 0x1; + pDst->shortGI160and80plus80MHz = tmp62__ >> 6 & 0x1; + pDst->txSTBC = tmp62__ >> 7 & 0x1; + pDst->rxSTBC = tmp62__ >> 8 & 0x7; + pDst->suBeamFormerCap = tmp62__ >> 11 & 0x1; + pDst->suBeamformeeCap = tmp62__ >> 12 & 0x1; + pDst->csnofBeamformerAntSup = tmp62__ >> 13 & 0x7; + pDst->numSoundingDim = tmp62__ >> 16 & 0x7; + pDst->muBeamformerCap = tmp62__ >> 19 & 0x1; + pDst->muBeamformeeCap = tmp62__ >> 20 & 0x1; + pDst->vhtTXOPPS = tmp62__ >> 21 & 0x1; + pDst->htcVHTCap = tmp62__ >> 22 & 0x1; + pDst->maxAMPDULenExp = tmp62__ >> 23 & 0x7; + pDst->vhtLinkAdaptCap = tmp62__ >> 26 & 0x3; + pDst->rxAntPattern = tmp62__ >> 28 & 0x1; + pDst->txAntPattern = tmp62__ >> 29 & 0x1; + pDst->reserved1 = tmp62__ >> 30 & 0x3; framesntohs(pCtx, &pDst->rxMCSMap, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - framesntohs(pCtx, &tmp72__, pBuf, 0); + framesntohs(pCtx, &tmp63__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->rxHighSupDataRate = tmp72__ >> 0 & 0x1fff; - pDst->reserved2 = tmp72__ >> 13 & 0x7; + pDst->rxHighSupDataRate = tmp63__ >> 0 & 0x1fff; + pDst->reserved2 = tmp63__ >> 13 & 0x7; framesntohs(pCtx, &pDst->txMCSMap, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - framesntohs(pCtx, &tmp73__, pBuf, 0); - pDst->txSupDataRate = tmp73__ >> 0 & 0x1fff; - pDst->reserved3 = tmp73__ >> 13 & 0x7; + framesntohs(pCtx, &tmp64__, pBuf, 0); + pDst->txSupDataRate = tmp64__ >> 0 & 0x1fff; + pDst->reserved3 = tmp64__ >> 13 & 0x7; (void)pCtx; return status; } /* End dot11fUnpackIeVHTCaps. */ -#define SigIeVHTCaps ( 0x0079 ) +#define SigIeVHTCaps ( 0x0067 ) tANI_U32 dot11fUnpackIeVHTExtBssLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTExtBssLoad *pDst) @@ -5045,7 +4612,7 @@ tANI_U32 dot11fUnpackIeVHTExtBssLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeVHTExtBssLoad. */ -#define SigIeVHTExtBssLoad ( 0x007a ) +#define SigIeVHTExtBssLoad ( 0x0068 ) tANI_U32 dot11fUnpackIeVHTOperation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTOperation *pDst) @@ -5068,7 +4635,7 @@ tANI_U32 dot11fUnpackIeVHTOperation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeVHTOperation. */ -#define SigIeVHTOperation ( 0x007b ) +#define SigIeVHTOperation ( 0x0069 ) tANI_U32 dot11fUnpackIeVendor1IE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVendor1IE *pDst) @@ -5081,7 +4648,7 @@ tANI_U32 dot11fUnpackIeVendor1IE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeVendor1IE. */ -#define SigIeVendor1IE ( 0x007c ) +#define SigIeVendor1IE ( 0x006a ) tANI_U32 dot11fUnpackIeVendor2IE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVendor2IE *pDst) @@ -5094,7 +4661,7 @@ tANI_U32 dot11fUnpackIeVendor2IE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeVendor2IE. */ -#define SigIeVendor2IE ( 0x007d ) +#define SigIeVendor2IE ( 0x006b ) tANI_U32 dot11fUnpackIeVendor3IE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVendor3IE *pDst) @@ -5107,13 +4674,13 @@ tANI_U32 dot11fUnpackIeVendor3IE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeVendor3IE. */ -#define SigIeVendor3IE ( 0x007e ) +#define SigIeVendor3IE ( 0x006c ) tANI_U32 dot11fUnpackIeWAPI(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWAPI *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U16 tmp74__; + tANI_U16 tmp65__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; @@ -5150,11 +4717,11 @@ tANI_U32 dot11fUnpackIeWAPI(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, t DOT11F_MEMCPY(pCtx, pDst->multicast_cipher_suite, pBuf, 4); pBuf += 4; ielen -= (tANI_U8)4; - framesntohs(pCtx, &tmp74__, pBuf, 0); + framesntohs(pCtx, &tmp65__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->preauth = tmp74__ >> 0 & 0x1; - pDst->reserved = tmp74__ >> 1 & 0x7fff; + pDst->preauth = tmp65__ >> 0 & 0x1; + pDst->reserved = tmp65__ >> 1 & 0x7fff; if ( ! ielen ) { pDst->bkid_count = 0U; @@ -5176,7 +4743,7 @@ tANI_U32 dot11fUnpackIeWAPI(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, t return status; } /* End dot11fUnpackIeWAPI. */ -#define SigIeWAPI ( 0x007f ) +#define SigIeWAPI ( 0x006d ) tANI_U32 dot11fUnpackIeWAPIOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWAPIOpaque *pDst) @@ -5196,7 +4763,7 @@ tANI_U32 dot11fUnpackIeWAPIOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie return status; } /* End dot11fUnpackIeWAPIOpaque. */ -#define SigIeWAPIOpaque ( 0x0080 ) +#define SigIeWAPIOpaque ( 0x006e ) tANI_U32 dot11fUnpackIeWFATPC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWFATPC *pDst) @@ -5213,7 +4780,7 @@ tANI_U32 dot11fUnpackIeWFATPC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeWFATPC. */ -#define SigIeWFATPC ( 0x0081 ) +#define SigIeWFATPC ( 0x006f ) tANI_U32 dot11fUnpackIeWFDIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWFDIEOpaque *pDst) @@ -5233,13 +4800,13 @@ tANI_U32 dot11fUnpackIeWFDIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWFDIEOpaque. */ -#define SigIeWFDIEOpaque ( 0x0082 ) +#define SigIeWFDIEOpaque ( 0x0070 ) tANI_U32 dot11fUnpackIeWMMCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMCaps *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp75__; + tANI_U8 tmp66__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; @@ -5251,76 +4818,76 @@ tANI_U32 dot11fUnpackIeWMMCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen pDst->present = 0; return ( status | DOT11F_BAD_FIXED_VALUE ); } - tmp75__ = *pBuf; - pDst->reserved = tmp75__ >> 0 & 0xf; - pDst->qack = tmp75__ >> 4 & 0x1; - pDst->queue_request = tmp75__ >> 5 & 0x1; - pDst->txop_request = tmp75__ >> 6 & 0x1; - pDst->more_ack = tmp75__ >> 7 & 0x1; + tmp66__ = *pBuf; + pDst->reserved = tmp66__ >> 0 & 0xf; + pDst->qack = tmp66__ >> 4 & 0x1; + pDst->queue_request = tmp66__ >> 5 & 0x1; + pDst->txop_request = tmp66__ >> 6 & 0x1; + pDst->more_ack = tmp66__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11fUnpackIeWMMCaps. */ -#define SigIeWMMCaps ( 0x0083 ) +#define SigIeWMMCaps ( 0x0071 ) tANI_U32 dot11fUnpackIeWMMInfoAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoAp *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp76__; + tANI_U8 tmp67__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; pDst->version = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; - tmp76__ = *pBuf; - pDst->param_set_count = tmp76__ >> 0 & 0xf; - pDst->reserved = tmp76__ >> 4 & 0x7; - pDst->uapsd = tmp76__ >> 7 & 0x1; + tmp67__ = *pBuf; + pDst->param_set_count = tmp67__ >> 0 & 0xf; + pDst->reserved = tmp67__ >> 4 & 0x7; + pDst->uapsd = tmp67__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11fUnpackIeWMMInfoAp. */ -#define SigIeWMMInfoAp ( 0x0084 ) +#define SigIeWMMInfoAp ( 0x0072 ) tANI_U32 dot11fUnpackIeWMMInfoStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoStation *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp77__; + tANI_U8 tmp68__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; pDst->version = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; - tmp77__ = *pBuf; - pDst->acvo_uapsd = tmp77__ >> 0 & 0x1; - pDst->acvi_uapsd = tmp77__ >> 1 & 0x1; - pDst->acbk_uapsd = tmp77__ >> 2 & 0x1; - pDst->acbe_uapsd = tmp77__ >> 3 & 0x1; - pDst->reserved1 = tmp77__ >> 4 & 0x1; - pDst->max_sp_length = tmp77__ >> 5 & 0x3; - pDst->reserved2 = tmp77__ >> 7 & 0x1; + tmp68__ = *pBuf; + pDst->acvo_uapsd = tmp68__ >> 0 & 0x1; + pDst->acvi_uapsd = tmp68__ >> 1 & 0x1; + pDst->acbk_uapsd = tmp68__ >> 2 & 0x1; + pDst->acbe_uapsd = tmp68__ >> 3 & 0x1; + pDst->reserved1 = tmp68__ >> 4 & 0x1; + pDst->max_sp_length = tmp68__ >> 5 & 0x3; + pDst->reserved2 = tmp68__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11fUnpackIeWMMInfoStation. */ -#define SigIeWMMInfoStation ( 0x0085 ) +#define SigIeWMMInfoStation ( 0x0073 ) tANI_U32 dot11fUnpackIeWMMParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMParams *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp78__; - tANI_U8 tmp79__; - tANI_U8 tmp80__; - tANI_U8 tmp81__; - tANI_U8 tmp82__; - tANI_U8 tmp83__; - tANI_U8 tmp84__; - tANI_U8 tmp85__; + tANI_U8 tmp69__; + tANI_U8 tmp70__; + tANI_U8 tmp71__; + tANI_U8 tmp72__; + tANI_U8 tmp73__; + tANI_U8 tmp74__; + tANI_U8 tmp75__; + tANI_U8 tmp76__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; @@ -5338,69 +4905,69 @@ tANI_U32 dot11fUnpackIeWMMParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel pDst->reserved2 = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; - tmp78__ = *pBuf; + tmp69__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_aifsn = tmp78__ >> 0 & 0xf; - pDst->acbe_acm = tmp78__ >> 4 & 0x1; - pDst->acbe_aci = tmp78__ >> 5 & 0x3; - pDst->unused1 = tmp78__ >> 7 & 0x1; - tmp79__ = *pBuf; + pDst->acbe_aifsn = tmp69__ >> 0 & 0xf; + pDst->acbe_acm = tmp69__ >> 4 & 0x1; + pDst->acbe_aci = tmp69__ >> 5 & 0x3; + pDst->unused1 = tmp69__ >> 7 & 0x1; + tmp70__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_acwmin = tmp79__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp79__ >> 4 & 0xf; + pDst->acbe_acwmin = tmp70__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp70__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp80__ = *pBuf; + tmp71__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp80__ >> 0 & 0xf; - pDst->acbk_acm = tmp80__ >> 4 & 0x1; - pDst->acbk_aci = tmp80__ >> 5 & 0x3; - pDst->unused2 = tmp80__ >> 7 & 0x1; - tmp81__ = *pBuf; + pDst->acbk_aifsn = tmp71__ >> 0 & 0xf; + pDst->acbk_acm = tmp71__ >> 4 & 0x1; + pDst->acbk_aci = tmp71__ >> 5 & 0x3; + pDst->unused2 = tmp71__ >> 7 & 0x1; + tmp72__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_acwmin = tmp81__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp81__ >> 4 & 0xf; + pDst->acbk_acwmin = tmp72__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp72__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp82__ = *pBuf; + tmp73__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp82__ >> 0 & 0xf; - pDst->acvi_acm = tmp82__ >> 4 & 0x1; - pDst->acvi_aci = tmp82__ >> 5 & 0x3; - pDst->unused3 = tmp82__ >> 7 & 0x1; - tmp83__ = *pBuf; + pDst->acvi_aifsn = tmp73__ >> 0 & 0xf; + pDst->acvi_acm = tmp73__ >> 4 & 0x1; + pDst->acvi_aci = tmp73__ >> 5 & 0x3; + pDst->unused3 = tmp73__ >> 7 & 0x1; + tmp74__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_acwmin = tmp83__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp83__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp74__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp74__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp84__ = *pBuf; + tmp75__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp84__ >> 0 & 0xf; - pDst->acvo_acm = tmp84__ >> 4 & 0x1; - pDst->acvo_aci = tmp84__ >> 5 & 0x3; - pDst->unused4 = tmp84__ >> 7 & 0x1; - tmp85__ = *pBuf; + pDst->acvo_aifsn = tmp75__ >> 0 & 0xf; + pDst->acvo_acm = tmp75__ >> 4 & 0x1; + pDst->acvo_aci = tmp75__ >> 5 & 0x3; + pDst->unused4 = tmp75__ >> 7 & 0x1; + tmp76__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_acwmin = tmp85__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp85__ >> 4 & 0xf; + pDst->acvo_acwmin = tmp76__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp76__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvo_txoplimit, pBuf, 0); (void)pCtx; return status; } /* End dot11fUnpackIeWMMParams. */ -#define SigIeWMMParams ( 0x0086 ) +#define SigIeWMMParams ( 0x0074 ) tANI_U32 dot11fUnpackIeWPA(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWPA *pDst) @@ -5482,7 +5049,7 @@ tANI_U32 dot11fUnpackIeWPA(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tD return status; } /* End dot11fUnpackIeWPA. */ -#define SigIeWPA ( 0x0087 ) +#define SigIeWPA ( 0x0075 ) tANI_U32 dot11fUnpackIeWPAOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWPAOpaque *pDst) @@ -5502,7 +5069,7 @@ tANI_U32 dot11fUnpackIeWPAOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeWPAOpaque. */ -#define SigIeWPAOpaque ( 0x0088 ) +#define SigIeWPAOpaque ( 0x0076 ) static const tTLVDefn TLVS_WSC[ ] = { @@ -5540,7 +5107,7 @@ tANI_U32 dot11fUnpackIeWSC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tD return status; } /* End dot11fUnpackIeWSC. */ -#define SigIeWSC ( 0x0089 ) +#define SigIeWSC ( 0x0077 ) static const tTLVDefn TLVS_WscAssocReq[ ] = { @@ -5559,7 +5126,7 @@ tANI_U32 dot11fUnpackIeWscAssocReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWscAssocReq. */ -#define SigIeWscAssocReq ( 0x008a ) +#define SigIeWscAssocReq ( 0x0078 ) static const tTLVDefn TLVS_WscAssocRes[ ] = { @@ -5578,7 +5145,7 @@ tANI_U32 dot11fUnpackIeWscAssocRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWscAssocRes. */ -#define SigIeWscAssocRes ( 0x008b ) +#define SigIeWscAssocRes ( 0x0079 ) static const tTLVDefn TLVS_WscBeacon[ ] = { @@ -5603,7 +5170,7 @@ tANI_U32 dot11fUnpackIeWscBeacon(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeWscBeacon. */ -#define SigIeWscBeacon ( 0x008c ) +#define SigIeWscBeacon ( 0x007a ) static const tTLVDefn TLVS_WscBeaconProbeRes[ ] = { @@ -5636,7 +5203,7 @@ tANI_U32 dot11fUnpackIeWscBeaconProbeRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tAN return status; } /* End dot11fUnpackIeWscBeaconProbeRes. */ -#define SigIeWscBeaconProbeRes ( 0x008d ) +#define SigIeWscBeaconProbeRes ( 0x007b ) tANI_U32 dot11fUnpackIeWscIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWscIEOpaque *pDst) @@ -5656,7 +5223,7 @@ tANI_U32 dot11fUnpackIeWscIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWscIEOpaque. */ -#define SigIeWscIEOpaque ( 0x008e ) +#define SigIeWscIEOpaque ( 0x007c ) static const tTLVDefn TLVS_WscProbeReq[ ] = { @@ -5687,7 +5254,7 @@ tANI_U32 dot11fUnpackIeWscProbeReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWscProbeReq. */ -#define SigIeWscProbeReq ( 0x008f ) +#define SigIeWscProbeReq ( 0x007d ) static const tTLVDefn TLVS_WscProbeRes[ ] = { @@ -5720,7 +5287,7 @@ tANI_U32 dot11fUnpackIeWscProbeRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWscProbeRes. */ -#define SigIeWscProbeRes ( 0x0090 ) +#define SigIeWscProbeRes ( 0x007e ) static const tTLVDefn TLVS_WscReassocRes[ ] = { @@ -5739,7 +5306,7 @@ tANI_U32 dot11fUnpackIeWscReassocRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeWscReassocRes. */ -#define SigIeWscReassocRes ( 0x0091 ) +#define SigIeWscReassocRes ( 0x007f ) static const tFFDefn FFS_AddBAReq[] = { @@ -6388,7 +5955,6 @@ tANI_U32 dot11fUnpackAddTSResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 {offsetof(tDot11fAssocRequest, HTCaps), offsetof(tDot11fIEHTCaps, present), 0, "HTCaps" , 0, 28, 60, SigIeHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTCAPS, 0, }, {offsetof(tDot11fAssocRequest, WMMCaps), offsetof(tDot11fIEWMMCaps, present), 0, "WMMCaps" , 0, 9, 9, SigIeWMMCaps, {0, 80, 242, 2, 5}, 5, DOT11F_EID_WMMCAPS, 0, }, {offsetof(tDot11fAssocRequest, WMMInfoStation), offsetof(tDot11fIEWMMInfoStation, present), 0, "WMMInfoStation" , 0, 9, 9, SigIeWMMInfoStation, {0, 80, 242, 2, 0}, 5, DOT11F_EID_WMMINFOSTATION, 0, }, - {offsetof(tDot11fAssocRequest, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fAssocRequest, WscIEOpaque), offsetof(tDot11fIEWscIEOpaque, present), 0, "WscIEOpaque" , 0, 8, 255, SigIeWscIEOpaque, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCIEOPAQUE, 0, }, {offsetof(tDot11fAssocRequest, WAPIOpaque), offsetof(tDot11fIEWAPIOpaque, present), 0, "WAPIOpaque" , 0, 8, 255, SigIeWAPIOpaque, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WAPIOPAQUE, 0, }, {offsetof(tDot11fAssocRequest, WAPI), offsetof(tDot11fIEWAPI, present), 0, "WAPI" , 0, 14, 112, SigIeWAPI, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WAPI, 0, }, @@ -6655,217 +6221,6 @@ tANI_U32 dot11fUnpackAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("max_sp_length (2): %d\n"), pFrm->WMMInfoStation.max_sp_length); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved2 (1): %d\n"), pFrm->WMMInfoStation.reserved2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("WscIEOpaque:\n")); if (!pFrm->WscIEOpaque.present) { @@ -7111,7 +6466,6 @@ tANI_U32 dot11fUnpackAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n {offsetof(tDot11fAssocResponse, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, {offsetof(tDot11fAssocResponse, ESETxmitPower), offsetof(tDot11fIEESETxmitPower, present), 0, "ESETxmitPower" , 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, }, {offsetof(tDot11fAssocResponse, WMMTSPEC), offsetof(tDot11fIEWMMTSPEC, present), offsetof(tDot11fAssocResponse, num_WMMTSPEC), "WMMTSPEC" , 4, 63, 63, SigIeWMMTSPEC, {0, 80, 242, 2, 2}, 5, DOT11F_EID_WMMTSPEC, 0, }, - {offsetof(tDot11fAssocResponse, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fAssocResponse, WscAssocRes), offsetof(tDot11fIEWscAssocRes, present), 0, "WscAssocRes" , 0, 6, 37, SigIeWscAssocRes, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCASSOCRES, 0, }, {offsetof(tDot11fAssocResponse, P2PAssocRes), offsetof(tDot11fIEP2PAssocRes, present), 0, "P2PAssocRes" , 0, 6, 17, SigIeP2PAssocRes, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PASSOCRES, 0, }, {offsetof(tDot11fAssocResponse, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, }, @@ -7840,217 +7194,6 @@ tANI_U32 dot11fUnpackAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->WMMTSPEC[i].medium_time, 2); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("WscAssocRes:\n")); if (!pFrm->WscAssocRes.present) { @@ -8748,7 +7891,6 @@ tANI_U32 dot11fUnpackAuthentication(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 {offsetof(tDot11fBeacon, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, {offsetof(tDot11fBeacon, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, {offsetof(tDot11fBeacon, ESETxmitPower), offsetof(tDot11fIEESETxmitPower, present), 0, "ESETxmitPower" , 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, }, - {offsetof(tDot11fBeacon, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fBeacon, WscBeacon), offsetof(tDot11fIEWscBeacon, present), 0, "WscBeacon" , 0, 6, 84, SigIeWscBeacon, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCBEACON, 0, }, {offsetof(tDot11fBeacon, P2PBeacon), offsetof(tDot11fIEP2PBeacon, present), 0, "P2PBeacon" , 0, 6, 61, SigIeP2PBeacon, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PBEACON, 0, }, {offsetof(tDot11fBeacon, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, }, @@ -9337,217 +8479,6 @@ tANI_U32 dot11fUnpackBeacon(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, t FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("WscBeacon:\n")); if (!pFrm->WscBeacon.present) { @@ -10045,7 +8976,6 @@ tANI_U32 dot11fUnpackBeacon1(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, {offsetof(tDot11fBeacon2, WMMInfoAp), offsetof(tDot11fIEWMMInfoAp, present), 0, "WMMInfoAp" , 0, 9, 9, SigIeWMMInfoAp, {0, 80, 242, 2, 0}, 5, DOT11F_EID_WMMINFOAP, 0, }, {offsetof(tDot11fBeacon2, WMMParams), offsetof(tDot11fIEWMMParams, present), 0, "WMMParams" , 0, 26, 26, SigIeWMMParams, {0, 80, 242, 2, 1}, 5, DOT11F_EID_WMMPARAMS, 0, }, {offsetof(tDot11fBeacon2, WMMCaps), offsetof(tDot11fIEWMMCaps, present), 0, "WMMCaps" , 0, 9, 9, SigIeWMMCaps, {0, 80, 242, 2, 5}, 5, DOT11F_EID_WMMCAPS, 0, }, - {offsetof(tDot11fBeacon2, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fBeacon2, WscBeacon), offsetof(tDot11fIEWscBeacon, present), 0, "WscBeacon" , 0, 6, 84, SigIeWscBeacon, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCBEACON, 0, }, {offsetof(tDot11fBeacon2, WAPI), offsetof(tDot11fIEWAPI, present), 0, "WAPI" , 0, 14, 112, SigIeWAPI, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WAPI, 0, }, {offsetof(tDot11fBeacon2, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, @@ -10435,217 +9365,6 @@ tANI_U32 dot11fUnpackBeacon2(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("txop_request (1): %d\n"), pFrm->WMMCaps.txop_request); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("more_ack (1): %d\n"), pFrm->WMMCaps.more_ack); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("WscBeacon:\n")); if (!pFrm->WscBeacon.present) { @@ -11102,7 +9821,6 @@ tANI_U32 dot11fUnpackBeacon2(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, {offsetof(tDot11fBeaconIEs, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, {offsetof(tDot11fBeaconIEs, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, {offsetof(tDot11fBeaconIEs, ESETxmitPower), offsetof(tDot11fIEESETxmitPower, present), 0, "ESETxmitPower" , 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, }, - {offsetof(tDot11fBeaconIEs, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fBeaconIEs, WscBeaconProbeRes), offsetof(tDot11fIEWscBeaconProbeRes, present), 0, "WscBeaconProbeRes" , 0, 6, 319, SigIeWscBeaconProbeRes, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCBEACONPROBERES, 0, }, {offsetof(tDot11fBeaconIEs, P2PBeaconProbeRes), offsetof(tDot11fIEP2PBeaconProbeRes, present), 0, "P2PBeaconProbeRes" , 0, 6, 1150, SigIeP2PBeaconProbeRes, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PBEACONPROBERES, 0, }, {offsetof(tDot11fBeaconIEs, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, }, @@ -11679,217 +10397,6 @@ tANI_U32 dot11fUnpackBeaconIEs(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("WscBeaconProbeRes:\n")); if (!pFrm->WscBeaconProbeRes.present) { @@ -14651,7 +13158,6 @@ tANI_U32 dot11fUnpackProbeRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n {offsetof(tDot11fProbeResponse, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, {offsetof(tDot11fProbeResponse, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, {offsetof(tDot11fProbeResponse, ESETxmitPower), offsetof(tDot11fIEESETxmitPower, present), 0, "ESETxmitPower" , 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, }, - {offsetof(tDot11fProbeResponse, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fProbeResponse, WscProbeRes), offsetof(tDot11fIEWscProbeRes, present), 0, "WscProbeRes" , 0, 6, 319, SigIeWscProbeRes, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCPROBERES, 0, }, {offsetof(tDot11fProbeResponse, P2PProbeRes), offsetof(tDot11fIEP2PProbeRes, present), 0, "P2PProbeRes" , 0, 6, 1141, SigIeP2PProbeRes, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PPROBERES, 0, }, {offsetof(tDot11fProbeResponse, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, }, @@ -15204,217 +13710,6 @@ tANI_U32 dot11fUnpackProbeResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("WscProbeRes:\n")); if (!pFrm->WscProbeRes.present) { @@ -16284,7 +14579,6 @@ tANI_U32 dot11fUnpackRadioMeasurementRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, {offsetof(tDot11fReAssocRequest, HTCaps), offsetof(tDot11fIEHTCaps, present), 0, "HTCaps" , 0, 28, 60, SigIeHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTCAPS, 0, }, {offsetof(tDot11fReAssocRequest, WMMCaps), offsetof(tDot11fIEWMMCaps, present), 0, "WMMCaps" , 0, 9, 9, SigIeWMMCaps, {0, 80, 242, 2, 5}, 5, DOT11F_EID_WMMCAPS, 0, }, {offsetof(tDot11fReAssocRequest, WMMInfoStation), offsetof(tDot11fIEWMMInfoStation, present), 0, "WMMInfoStation" , 0, 9, 9, SigIeWMMInfoStation, {0, 80, 242, 2, 0}, 5, DOT11F_EID_WMMINFOSTATION, 0, }, - {offsetof(tDot11fReAssocRequest, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fReAssocRequest, WscIEOpaque), offsetof(tDot11fIEWscIEOpaque, present), 0, "WscIEOpaque" , 0, 8, 255, SigIeWscIEOpaque, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCIEOPAQUE, 0, }, {offsetof(tDot11fReAssocRequest, WAPIOpaque), offsetof(tDot11fIEWAPIOpaque, present), 0, "WAPIOpaque" , 0, 8, 255, SigIeWAPIOpaque, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WAPIOPAQUE, 0, }, {offsetof(tDot11fReAssocRequest, WAPI), offsetof(tDot11fIEWAPI, present), 0, "WAPI" , 0, 14, 112, SigIeWAPI, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WAPI, 0, }, @@ -16882,217 +15176,6 @@ tANI_U32 dot11fUnpackReAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("max_sp_length (2): %d\n"), pFrm->WMMInfoStation.max_sp_length); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved2 (1): %d\n"), pFrm->WMMInfoStation.reserved2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("WscIEOpaque:\n")); if (!pFrm->WscIEOpaque.present) { @@ -17398,7 +15481,6 @@ tANI_U32 dot11fUnpackReAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 {offsetof(tDot11fReAssocResponse, ESETxmitPower), offsetof(tDot11fIEESETxmitPower, present), 0, "ESETxmitPower" , 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, }, {offsetof(tDot11fReAssocResponse, WMMTSPEC), offsetof(tDot11fIEWMMTSPEC, present), offsetof(tDot11fReAssocResponse, num_WMMTSPEC), "WMMTSPEC" , 4, 63, 63, SigIeWMMTSPEC, {0, 80, 242, 2, 2}, 5, DOT11F_EID_WMMTSPEC, 0, }, {offsetof(tDot11fReAssocResponse, ESETrafStrmRateSet), offsetof(tDot11fIEESETrafStrmRateSet, present), 0, "ESETrafStrmRateSet" , 0, 7, 15, SigIeESETrafStrmRateSet, {0, 64, 150, 8, 0}, 4, DOT11F_EID_ESETRAFSTRMRATESET, 0, }, - {offsetof(tDot11fReAssocResponse, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fReAssocResponse, WscReassocRes), offsetof(tDot11fIEWscReassocRes, present), 0, "WscReassocRes" , 0, 6, 37, SigIeWscReassocRes, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCREASSOCRES, 0, }, {offsetof(tDot11fReAssocResponse, P2PAssocRes), offsetof(tDot11fIEP2PAssocRes, present), 0, "P2PAssocRes" , 0, 6, 17, SigIeP2PAssocRes, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PASSOCRES, 0, }, {offsetof(tDot11fReAssocResponse, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, }, @@ -18134,217 +16216,6 @@ tANI_U32 dot11fUnpackReAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U3 FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_tsrates: %d.\n"), pFrm->ESETrafStrmRateSet.num_tsrates); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->ESETrafStrmRateSet.tsrates, pFrm->ESETrafStrmRateSet.num_tsrates); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("WscReassocRes:\n")); if (!pFrm->WscReassocRes.present) { @@ -21115,55 +18986,15 @@ static tANI_U32 UnpackCore(tpAniSirGlobal pCtx, countOffset = ( (0 != pIe->arraybound) * ( *(tANI_U16* )(pFrm + pIe->countOffset))); switch (pIe->sig) { - case SigIeAPName: - status |= dot11fUnpackIeAPName(pCtx, pBufRemaining, len, ( tDot11fIEAPName* )(pFrm + pIe->offset + sizeof(tDot11fIEAPName)*countOffset) ); - break; - case SigIeBPIndicator: - status |= dot11fUnpackIeBPIndicator(pCtx, pBufRemaining, len, ( tDot11fIEBPIndicator* )(pFrm + pIe->offset + sizeof(tDot11fIEBPIndicator)*countOffset) ); - break; case SigIeCondensedCountryStr: status |= dot11fUnpackIeCondensedCountryStr(pCtx, pBufRemaining, len, ( tDot11fIECondensedCountryStr* )(pFrm + pIe->offset + sizeof(tDot11fIECondensedCountryStr)*countOffset) ); break; case SigIeGTK: status |= dot11fUnpackIeGTK(pCtx, pBufRemaining, len, ( tDot11fIEGTK* )(pFrm + pIe->offset + sizeof(tDot11fIEGTK)*countOffset) ); break; - case SigIeHCF: - status |= dot11fUnpackIeCommonFunc(pCtx, pBufRemaining, len, - (tANI_U8*) &((( tDot11fIEHCF* )(pFrm + pIe->offset + sizeof( tDot11fIEHCF)*countOffset ) )->present), - (tANI_U8*) &((( tDot11fIEHCF* )(pFrm + pIe->offset + sizeof(tDot11fIEHCF)*countOffset ) )->enabled) ); - break; case SigIeIGTK: status |= dot11fUnpackIeIGTK(pCtx, pBufRemaining, len, ( tDot11fIEIGTK* )(pFrm + pIe->offset + sizeof(tDot11fIEIGTK)*countOffset) ); break; - case SigIeLLAttr: - status |= dot11fUnpackIeLLAttr(pCtx, pBufRemaining, len, ( tDot11fIELLAttr* )(pFrm + pIe->offset + sizeof(tDot11fIELLAttr)*countOffset) ); - break; - case SigIeLoadBalance: - status |= dot11fUnpackIeLoadBalance(pCtx, pBufRemaining, len, ( tDot11fIELoadBalance* )(pFrm + pIe->offset + sizeof(tDot11fIELoadBalance)*countOffset) ); - break; - case SigIeLoadInfo: - status |= dot11fUnpackIeLoadInfo(pCtx, pBufRemaining, len, ( tDot11fIELoadInfo* )(pFrm + pIe->offset + sizeof(tDot11fIELoadInfo)*countOffset) ); - break; - case SigIePropAssocType: - status |= dot11fUnpackIeCommonFunc(pCtx, pBufRemaining, len, - (tANI_U8*) &((( tDot11fIEPropAssocType* )(pFrm + pIe->offset + sizeof( tDot11fIEPropAssocType)*countOffset ) )->present), - (tANI_U8*) &((( tDot11fIEPropAssocType* )(pFrm + pIe->offset + sizeof(tDot11fIEPropAssocType)*countOffset ) )->type) ); - break; - case SigIePropCapability: - status |= dot11fUnpackIePropCapability(pCtx, pBufRemaining, len, ( tDot11fIEPropCapability* )(pFrm + pIe->offset + sizeof(tDot11fIEPropCapability)*countOffset) ); - break; - case SigIePropChannSwitchAnn: - status |= dot11fUnpackIePropChannSwitchAnn(pCtx, pBufRemaining, len, ( tDot11fIEPropChannSwitchAnn* )(pFrm + pIe->offset + sizeof(tDot11fIEPropChannSwitchAnn)*countOffset) ); - break; - case SigIePropEDCAParams: - status |= dot11fUnpackIePropEDCAParams(pCtx, pBufRemaining, len, ( tDot11fIEPropEDCAParams* )(pFrm + pIe->offset + sizeof(tDot11fIEPropEDCAParams)*countOffset) ); - break; - case SigIePropQuietBSS: - status |= dot11fUnpackIePropQuietBSS(pCtx, pBufRemaining, len, ( tDot11fIEPropQuietBSS* )(pFrm + pIe->offset + sizeof(tDot11fIEPropQuietBSS)*countOffset) ); - break; - case SigIePropSuppRates: - status |= dot11fUnpackIePropSuppRates(pCtx, pBufRemaining, len, ( tDot11fIEPropSuppRates* )(pFrm + pIe->offset + sizeof(tDot11fIEPropSuppRates)*countOffset) ); - break; case SigIeR0KH_ID: status |= dot11fUnpackIeR0KH_ID(pCtx, pBufRemaining, len, ( tDot11fIER0KH_ID* )(pFrm + pIe->offset + sizeof(tDot11fIER0KH_ID)*countOffset) ); break; @@ -21173,23 +19004,6 @@ static tANI_U32 UnpackCore(tpAniSirGlobal pCtx, case SigIeTSFInfo: status |= dot11fUnpackIeTSFInfo(pCtx, pBufRemaining, len, ( tDot11fIETSFInfo* )(pFrm + pIe->offset + sizeof(tDot11fIETSFInfo)*countOffset) ); break; - case SigIeTaurus: - status |= dot11fUnpackIeTaurus(pCtx, pBufRemaining, len, ( tDot11fIETaurus* )(pFrm + pIe->offset + sizeof(tDot11fIETaurus)*countOffset) ); - break; - case SigIeTitan: - status |= dot11fUnpackIeTitan(pCtx, pBufRemaining, len, ( tDot11fIETitan* )(pFrm + pIe->offset + sizeof(tDot11fIETitan)*countOffset) ); - break; - case SigIeTriggerStaBgScan: - status |= dot11fUnpackIeCommonFunc(pCtx, pBufRemaining, len, - (tANI_U8*) &((( tDot11fIETriggerStaBgScan* )(pFrm + pIe->offset + sizeof( tDot11fIETriggerStaBgScan)*countOffset ) )->present), - (tANI_U8*) &((( tDot11fIETriggerStaBgScan* )(pFrm + pIe->offset + sizeof(tDot11fIETriggerStaBgScan)*countOffset ) )->enable) ); - break; - case SigIeVersion: - status |= dot11fUnpackIeVersion(pCtx, pBufRemaining, len, ( tDot11fIEVersion* )(pFrm + pIe->offset + sizeof(tDot11fIEVersion)*countOffset) ); - break; - case SigIeWDS: - status |= dot11fUnpackIeWDS(pCtx, pBufRemaining, len, ( tDot11fIEWDS* )(pFrm + pIe->offset + sizeof(tDot11fIEWDS)*countOffset) ); - break; case SigIeAPChannelReport: status |= dot11fUnpackIeAPChannelReport(pCtx, pBufRemaining, len, ( tDot11fIEAPChannelReport* )(pFrm + pIe->offset + sizeof(tDot11fIEAPChannelReport)*countOffset) ); break; @@ -21261,9 +19075,6 @@ static tANI_U32 UnpackCore(tpAniSirGlobal pCtx, case SigIeAID: status |= dot11fUnpackIeAID(pCtx, pBufRemaining, len, ( tDot11fIEAID* )(pFrm + pIe->offset + sizeof(tDot11fIEAID)*countOffset) ); break; - case SigIeAirgo: - status |= dot11fUnpackIeAirgo(pCtx, pBufRemaining, len, ( tDot11fIEAirgo* )(pFrm + pIe->offset + sizeof(tDot11fIEAirgo)*countOffset) ); - break; case SigIeCFParams: status |= dot11fUnpackIeCFParams(pCtx, pBufRemaining, len, ( tDot11fIECFParams* )(pFrm + pIe->offset + sizeof(tDot11fIECFParams)*countOffset) ); break; @@ -22086,18 +19897,6 @@ tANI_U32 dot11fGetPackedIEWMMTCLAS(tpAniSirGlobal pCtx, tDot11fIEWMMTCLAS *pIe, return status; } /* End dot11fGetPackedIEWMMTCLAS. */ -tANI_U32 dot11fGetPackedIEAirgo(tpAniSirGlobal pCtx, tDot11fIEAirgo *pIe, tANI_U32 *pnNeeded) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void)pCtx; - while ( pIe->present ) - { - status = GetPackedSizeCore(pCtx, ( tANI_U8* )pIe, pnNeeded, IES_Airgo); - break; - } - return status; -} /* End dot11fGetPackedIEAirgo. */ - tANI_U32 dot11fGetPackedIEChannelSwitchWrapper(tpAniSirGlobal pCtx, tDot11fIEChannelSwitchWrapper *pIe, tANI_U32 *pnNeeded) { tANI_U32 status = DOT11F_PARSE_SUCCESS; @@ -23221,16 +21020,6 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx, byteCount = 0; switch (pIe->sig) { - case SigIeAPName: - offset = sizeof(tDot11fIEAPName); - byteCount = ((tDot11fIEAPName* )(pFrm + pIe->offset + sizeof(tDot11fIEAPName) * i ))->num_name; - pIePresent = ( (tDot11fIEAPName* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeBPIndicator: - offset = sizeof(tDot11fIEBPIndicator); - byteCount = 2; - pIePresent = ( (tDot11fIEBPIndicator* )(pFrm + pIe->offset + offset * i ))->present; - break; case SigIeCondensedCountryStr: offset = sizeof(tDot11fIECondensedCountryStr); byteCount = 2; @@ -23241,61 +21030,11 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx, byteCount = ((tDot11fIEGTK* )(pFrm + pIe->offset + sizeof(tDot11fIEGTK) * i ))->num_key + 11; pIePresent = ( (tDot11fIEGTK* )(pFrm + pIe->offset + offset * i ))->present; break; - case SigIeHCF: - offset = sizeof(tDot11fIEHCF); - byteCount = 1; - pIePresent = ( (tDot11fIEHCF* )(pFrm + pIe->offset + offset * i ))->present; - break; case SigIeIGTK: offset = sizeof(tDot11fIEIGTK); byteCount = 33; pIePresent = ( (tDot11fIEIGTK* )(pFrm + pIe->offset + offset * i ))->present; break; - case SigIeLLAttr: - offset = sizeof(tDot11fIELLAttr); - byteCount = 4; - pIePresent = ( (tDot11fIELLAttr* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeLoadBalance: - offset = sizeof(tDot11fIELoadBalance); - byteCount = 7; - pIePresent = ( (tDot11fIELoadBalance* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeLoadInfo: - offset = sizeof(tDot11fIELoadInfo); - byteCount = 4; - pIePresent = ( (tDot11fIELoadInfo* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIePropAssocType: - offset = sizeof(tDot11fIEPropAssocType); - byteCount = 1; - pIePresent = ( (tDot11fIEPropAssocType* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIePropCapability: - offset = sizeof(tDot11fIEPropCapability); - byteCount = 2; - pIePresent = ( (tDot11fIEPropCapability* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIePropChannSwitchAnn: - offset = sizeof(tDot11fIEPropChannSwitchAnn); - byteCount = 4; - pIePresent = ( (tDot11fIEPropChannSwitchAnn* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIePropEDCAParams: - offset = sizeof(tDot11fIEPropEDCAParams); - byteCount = 18; - pIePresent = ( (tDot11fIEPropEDCAParams* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIePropQuietBSS: - offset = sizeof(tDot11fIEPropQuietBSS); - byteCount = 6; - pIePresent = ( (tDot11fIEPropQuietBSS* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIePropSuppRates: - offset = sizeof(tDot11fIEPropSuppRates); - byteCount = ((tDot11fIEPropSuppRates* )(pFrm + pIe->offset + sizeof(tDot11fIEPropSuppRates) * i ))->num_rates; - pIePresent = ( (tDot11fIEPropSuppRates* )(pFrm + pIe->offset + offset * i ))->present; - break; case SigIeR0KH_ID: offset = sizeof(tDot11fIER0KH_ID); byteCount = ((tDot11fIER0KH_ID* )(pFrm + pIe->offset + sizeof(tDot11fIER0KH_ID) * i ))->num_PMK_R0_ID; @@ -23311,31 +21050,6 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx, byteCount = 4; pIePresent = ( (tDot11fIETSFInfo* )(pFrm + pIe->offset + offset * i ))->present; break; - case SigIeTaurus: - offset = sizeof(tDot11fIETaurus); - byteCount = 6; - pIePresent = ( (tDot11fIETaurus* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeTitan: - offset = sizeof(tDot11fIETitan); - byteCount = 4; - pIePresent = ( (tDot11fIETitan* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeTriggerStaBgScan: - offset = sizeof(tDot11fIETriggerStaBgScan); - byteCount = 1; - pIePresent = ( (tDot11fIETriggerStaBgScan* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeVersion: - offset = sizeof(tDot11fIEVersion); - byteCount = ((tDot11fIEVersion* )(pFrm + pIe->offset + sizeof(tDot11fIEVersion) * i ))->num_build_version + 5; - pIePresent = ( (tDot11fIEVersion* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeWDS: - offset = sizeof(tDot11fIEWDS); - byteCount = ((tDot11fIEWDS* )(pFrm + pIe->offset + sizeof(tDot11fIEWDS) * i ))->num_wdsData; - pIePresent = ( (tDot11fIEWDS* )(pFrm + pIe->offset + offset * i ))->present; - break; case SigIeAPChannelReport: offset = sizeof(tDot11fIEAPChannelReport); byteCount = ((tDot11fIEAPChannelReport* )(pFrm + pIe->offset + sizeof(tDot11fIEAPChannelReport) * i ))->num_channelList + 1; @@ -23449,10 +21163,6 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx, byteCount = 2; pIePresent = ( (tDot11fIEAID* )(pFrm + pIe->offset + offset * i ))->present; break; - case SigIeAirgo: - offset = sizeof(tDot11fIEAirgo); - status |= dot11fGetPackedIEAirgo(pCtx, ( tDot11fIEAirgo* )(pFrm + pIe->offset + offset * i ), pnNeeded); - break; case SigIeCFParams: offset = sizeof(tDot11fIECFParams); byteCount = 6; @@ -24158,13 +21868,13 @@ void dot11fPackFfAddBAParameterSet(tpAniSirGlobal pCtx, tDot11fFfAddBAParameterSet *pSrc, tANI_U8 *pBuf) { - tANI_U16 tmp86__; - tmp86__ = 0U; - tmp86__ |= ( pSrc->amsduSupported << 0 ); - tmp86__ |= ( pSrc->policy << 1 ); - tmp86__ |= ( pSrc->tid << 2 ); - tmp86__ |= ( pSrc->bufferSize << 6 ); - frameshtons(pCtx, pBuf, tmp86__, 0); + tANI_U16 tmp77__; + tmp77__ = 0U; + tmp77__ |= ( pSrc->amsduSupported << 0 ); + tmp77__ |= ( pSrc->policy << 1 ); + tmp77__ |= ( pSrc->tid << 2 ); + tmp77__ |= ( pSrc->bufferSize << 6 ); + frameshtons(pCtx, pBuf, tmp77__, 0); (void)pCtx; } /* End dot11fPackFfAddBAParameterSet. */ @@ -24188,11 +21898,11 @@ void dot11fPackFfBAStartingSequenceControl(tpAniSirGlobal pCtx, tDot11fFfBAStartingSequenceControl *pSrc, tANI_U8 *pBuf) { - tANI_U16 tmp87__; - tmp87__ = 0U; - tmp87__ |= ( pSrc->fragNumber << 0 ); - tmp87__ |= ( pSrc->ssn << 4 ); - frameshtons(pCtx, pBuf, tmp87__, 0); + tANI_U16 tmp78__; + tmp78__ = 0U; + tmp78__ |= ( pSrc->fragNumber << 0 ); + tmp78__ |= ( pSrc->ssn << 4 ); + frameshtons(pCtx, pBuf, tmp78__, 0); (void)pCtx; } /* End dot11fPackFfBAStartingSequenceControl. */ @@ -24216,25 +21926,25 @@ void dot11fPackFfCapabilities(tpAniSirGlobal pCtx, tDot11fFfCapabilities *pSrc, tANI_U8 *pBuf) { - tANI_U16 tmp88__; - tmp88__ = 0U; - tmp88__ |= ( pSrc->ess << 0 ); - tmp88__ |= ( pSrc->ibss << 1 ); - tmp88__ |= ( pSrc->cfPollable << 2 ); - tmp88__ |= ( pSrc->cfPollReq << 3 ); - tmp88__ |= ( pSrc->privacy << 4 ); - tmp88__ |= ( pSrc->shortPreamble << 5 ); - tmp88__ |= ( pSrc->pbcc << 6 ); - tmp88__ |= ( pSrc->channelAgility << 7 ); - tmp88__ |= ( pSrc->spectrumMgt << 8 ); - tmp88__ |= ( pSrc->qos << 9 ); - tmp88__ |= ( pSrc->shortSlotTime << 10 ); - tmp88__ |= ( pSrc->apsd << 11 ); - tmp88__ |= ( pSrc->rrm << 12 ); - tmp88__ |= ( pSrc->dsssOfdm << 13 ); - tmp88__ |= ( pSrc->delayedBA << 14 ); - tmp88__ |= ( pSrc->immediateBA << 15 ); - frameshtons(pCtx, pBuf, tmp88__, 0); + tANI_U16 tmp79__; + tmp79__ = 0U; + tmp79__ |= ( pSrc->ess << 0 ); + tmp79__ |= ( pSrc->ibss << 1 ); + tmp79__ |= ( pSrc->cfPollable << 2 ); + tmp79__ |= ( pSrc->cfPollReq << 3 ); + tmp79__ |= ( pSrc->privacy << 4 ); + tmp79__ |= ( pSrc->shortPreamble << 5 ); + tmp79__ |= ( pSrc->pbcc << 6 ); + tmp79__ |= ( pSrc->channelAgility << 7 ); + tmp79__ |= ( pSrc->spectrumMgt << 8 ); + tmp79__ |= ( pSrc->qos << 9 ); + tmp79__ |= ( pSrc->shortSlotTime << 10 ); + tmp79__ |= ( pSrc->apsd << 11 ); + tmp79__ |= ( pSrc->rrm << 12 ); + tmp79__ |= ( pSrc->dsssOfdm << 13 ); + tmp79__ |= ( pSrc->delayedBA << 14 ); + tmp79__ |= ( pSrc->immediateBA << 15 ); + frameshtons(pCtx, pBuf, tmp79__, 0); (void)pCtx; } /* End dot11fPackFfCapabilities. */ @@ -24258,12 +21968,12 @@ void dot11fPackFfDelBAParameterSet(tpAniSirGlobal pCtx, tDot11fFfDelBAParameterSet *pSrc, tANI_U8 *pBuf) { - tANI_U16 tmp89__; - tmp89__ = 0U; - tmp89__ |= ( pSrc->reserved << 0 ); - tmp89__ |= ( pSrc->initiator << 11 ); - tmp89__ |= ( pSrc->tid << 12 ); - frameshtons(pCtx, pBuf, tmp89__, 0); + tANI_U16 tmp80__; + tmp80__ = 0U; + tmp80__ |= ( pSrc->reserved << 0 ); + tmp80__ |= ( pSrc->initiator << 11 ); + tmp80__ |= ( pSrc->tid << 12 ); + frameshtons(pCtx, pBuf, tmp80__, 0); (void)pCtx; } /* End dot11fPackFfDelBAParameterSet. */ @@ -24311,13 +22021,13 @@ void dot11fPackFfOperatingMode(tpAniSirGlobal pCtx, tDot11fFfOperatingMode *pSrc, tANI_U8 *pBuf) { - tANI_U8 tmp90__; - tmp90__ = 0U; - tmp90__ |= ( pSrc->chanWidth << 0 ); - tmp90__ |= ( pSrc->reserved << 2 ); - tmp90__ |= ( pSrc->rxNSS << 4 ); - tmp90__ |= ( pSrc->rxNSSType << 7 ); - *pBuf = tmp90__; + tANI_U8 tmp81__; + tmp81__ = 0U; + tmp81__ |= ( pSrc->chanWidth << 0 ); + tmp81__ |= ( pSrc->reserved << 2 ); + tmp81__ |= ( pSrc->rxNSS << 4 ); + tmp81__ |= ( pSrc->rxNSSType << 7 ); + *pBuf = tmp81__; (void)pCtx; } /* End dot11fPackFfOperatingMode. */ @@ -24373,12 +22083,12 @@ void dot11fPackFfSMPowerModeSet(tpAniSirGlobal pCtx, tDot11fFfSMPowerModeSet *pSrc, tANI_U8 *pBuf) { - tANI_U8 tmp91__; - tmp91__ = 0U; - tmp91__ |= ( pSrc->PowerSave_En << 0 ); - tmp91__ |= ( pSrc->Mode << 1 ); - tmp91__ |= ( pSrc->reserved << 2 ); - *pBuf = tmp91__; + tANI_U8 tmp82__; + tmp82__ = 0U; + tmp82__ |= ( pSrc->PowerSave_En << 0 ); + tmp82__ |= ( pSrc->Mode << 1 ); + tmp82__ |= ( pSrc->reserved << 2 ); + *pBuf = tmp82__; (void)pCtx; } /* End dot11fPackFfSMPowerModeSet. */ @@ -24418,19 +22128,19 @@ void dot11fPackFfTSInfo(tpAniSirGlobal pCtx, tDot11fFfTSInfo *pSrc, tANI_U8 *pBuf) { - tANI_U32 tmp92__; - tmp92__ = 0U; - tmp92__ |= ( pSrc->traffic_type << 0 ); - tmp92__ |= ( pSrc->tsid << 1 ); - tmp92__ |= ( pSrc->direction << 5 ); - tmp92__ |= ( pSrc->access_policy << 7 ); - tmp92__ |= ( pSrc->aggregation << 9 ); - tmp92__ |= ( pSrc->psb << 10 ); - tmp92__ |= ( pSrc->user_priority << 11 ); - tmp92__ |= ( pSrc->tsinfo_ack_pol << 14 ); - tmp92__ |= ( pSrc->schedule << 16 ); - tmp92__ |= ( pSrc->unused << 17 ); - frameshtonl(pCtx, pBuf, tmp92__, 0); + tANI_U32 tmp83__; + tmp83__ = 0U; + tmp83__ |= ( pSrc->traffic_type << 0 ); + tmp83__ |= ( pSrc->tsid << 1 ); + tmp83__ |= ( pSrc->direction << 5 ); + tmp83__ |= ( pSrc->access_policy << 7 ); + tmp83__ |= ( pSrc->aggregation << 9 ); + tmp83__ |= ( pSrc->psb << 10 ); + tmp83__ |= ( pSrc->user_priority << 11 ); + tmp83__ |= ( pSrc->tsinfo_ack_pol << 14 ); + tmp83__ |= ( pSrc->schedule << 16 ); + tmp83__ |= ( pSrc->unused << 17 ); + frameshtonl(pCtx, pBuf, tmp83__, 0); (void)pCtx; } /* End dot11fPackFfTSInfo. */ @@ -24551,7 +22261,7 @@ tANI_U32 dot11fPackTlvVersion2(tpAniSirGlobal pCtx, tANI_U8* pTlvLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp93__; + tANI_U8 tmp84__; nNeeded += 3; if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; while ( pSrc->present ) @@ -24560,10 +22270,10 @@ tANI_U32 dot11fPackTlvVersion2(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp93__ = 0U; - tmp93__ |= ( pSrc->minor << 0 ); - tmp93__ |= ( pSrc->major << 4 ); - *pBuf = tmp93__; + tmp84__ = 0U; + tmp84__ |= ( pSrc->minor << 0 ); + tmp84__ |= ( pSrc->major << 4 ); + *pBuf = tmp84__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -25772,7 +23482,7 @@ tANI_U32 dot11fPackTlvVersion(tpAniSirGlobal pCtx, tANI_U8* pTlvLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp94__; + tANI_U8 tmp85__; nNeeded += 5; if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; while ( pSrc->present ) @@ -25781,10 +23491,10 @@ tANI_U32 dot11fPackTlvVersion(tpAniSirGlobal pCtx, pBuf += 2; *pnConsumed += 2; pTlvLen = pBuf; pBuf += 2; *pnConsumed += 2; - tmp94__ = 0U; - tmp94__ |= ( pSrc->minor << 0 ); - tmp94__ |= ( pSrc->major << 4 ); - *pBuf = tmp94__; + tmp85__ = 0U; + tmp85__ |= ( pSrc->minor << 0 ); + tmp85__ |= ( pSrc->major << 4 ); + *pBuf = tmp85__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -25888,69 +23598,6 @@ tANI_U32 dot11fPackTlvP2PManageability(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11fPackTlvP2PManageability. */ -tANI_U32 dot11fPackIeAPName(tpAniSirGlobal pCtx, - tDot11fIEAPName *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += pSrc->num_name; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 1; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - DOT11F_MEMCPY(pCtx, pBuf, &( pSrc->name ), pSrc->num_name); - *pnConsumed += pSrc->num_name; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeAPName. */ - -tANI_U32 dot11fPackIeBPIndicator(tpAniSirGlobal pCtx, - tDot11fIEBPIndicator *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 2; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 4; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->indicator; - *pnConsumed += 1; - pBuf += 1; - *pBuf = pSrc->type; - *pnConsumed += 1; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeBPIndicator. */ - tANI_U32 dot11fPackIeCondensedCountryStr(tpAniSirGlobal pCtx, tDot11fIECondensedCountryStr *pSrc, tANI_U8 *pBuf, @@ -25990,7 +23637,7 @@ tANI_U32 dot11fPackIeGTK(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U16 tmp95__; + tANI_U16 tmp86__; nNeeded += (pSrc->num_key + 11); while ( pSrc->present ) { @@ -25999,10 +23646,10 @@ tANI_U32 dot11fPackIeGTK(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp95__ = 0U; - tmp95__ |= ( pSrc->keyId << 0 ); - tmp95__ |= ( pSrc->reserved << 2 ); - frameshtons(pCtx, pBuf, tmp95__, 0); + tmp86__ = 0U; + tmp86__ |= ( pSrc->keyId << 0 ); + tmp86__ |= ( pSrc->reserved << 2 ); + frameshtons(pCtx, pBuf, tmp86__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -26025,36 +23672,6 @@ tANI_U32 dot11fPackIeGTK(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11fPackIeGTK. */ -tANI_U32 dot11fPackIeHCF(tpAniSirGlobal pCtx, - tDot11fIEHCF *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 1; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 2; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->enabled; - *pnConsumed += 1; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeHCF. */ - tANI_U32 dot11fPackIeIGTK(tpAniSirGlobal pCtx, tDot11fIEIGTK *pSrc, tANI_U8 *pBuf, @@ -26094,387 +23711,6 @@ tANI_U32 dot11fPackIeIGTK(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11fPackIeIGTK. */ -tANI_U32 dot11fPackIeLLAttr(tpAniSirGlobal pCtx, - tDot11fIELLAttr *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 4; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 9; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - frameshtonl(pCtx, pBuf, pSrc->defer_threshold, 1); - *pnConsumed += 4; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeLLAttr. */ - -tANI_U32 dot11fPackIeLoadBalance(tpAniSirGlobal pCtx, - tDot11fIELoadBalance *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 7; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 8; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); - *pnConsumed += 6; - pBuf += 6; - *pBuf = pSrc->channel; - *pnConsumed += 1; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeLoadBalance. */ - -tANI_U32 dot11fPackIeLoadInfo(tpAniSirGlobal pCtx, - tDot11fIELoadInfo *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 4; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 6; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - frameshtons(pCtx, pBuf, pSrc->num_stas, 1); - *pnConsumed += 2; - pBuf += 2; - frameshtons(pCtx, pBuf, pSrc->channel_util, 1); - *pnConsumed += 2; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeLoadInfo. */ - -tANI_U32 dot11fPackIePropAssocType(tpAniSirGlobal pCtx, - tDot11fIEPropAssocType *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 1; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 7; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->type; - *pnConsumed += 1; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIePropAssocType. */ - -tANI_U32 dot11fPackIePropCapability(tpAniSirGlobal pCtx, - tDot11fIEPropCapability *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 2; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 10; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - frameshtons(pCtx, pBuf, pSrc->capability, 0); - *pnConsumed += 2; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIePropCapability. */ - -tANI_U32 dot11fPackIePropChannSwitchAnn(tpAniSirGlobal pCtx, - tDot11fIEPropChannSwitchAnn *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 4; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 15; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->mode; - *pnConsumed += 1; - pBuf += 1; - *pBuf = pSrc->primary_channel; - *pnConsumed += 1; - pBuf += 1; - *pBuf = pSrc->sub_band; - *pnConsumed += 1; - pBuf += 1; - *pBuf = pSrc->channel_switch_count; - *pnConsumed += 1; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIePropChannSwitchAnn. */ - -tANI_U32 dot11fPackIePropEDCAParams(tpAniSirGlobal pCtx, - tDot11fIEPropEDCAParams *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - tANI_U8 tmp96__; - tANI_U8 tmp97__; - tANI_U8 tmp98__; - tANI_U8 tmp99__; - tANI_U8 tmp100__; - tANI_U8 tmp101__; - tANI_U8 tmp102__; - tANI_U8 tmp103__; - nNeeded += 18; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 12; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->qos; - *pnConsumed += 1; - pBuf += 1; - *pBuf = pSrc->reserved; - *pnConsumed += 1; - pBuf += 1; - tmp96__ = 0U; - tmp96__ |= ( pSrc->acbe_aifsn << 0 ); - tmp96__ |= ( pSrc->acbe_acm << 4 ); - tmp96__ |= ( pSrc->acbe_aci << 5 ); - tmp96__ |= ( pSrc->unused1 << 7 ); - *pBuf = tmp96__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - tmp97__ = 0U; - tmp97__ |= ( pSrc->acbe_min << 0 ); - tmp97__ |= ( pSrc->acbe_max << 4 ); - *pBuf = tmp97__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; - tmp98__ = 0U; - tmp98__ |= ( pSrc->acbk_aifsn << 0 ); - tmp98__ |= ( pSrc->acbk_acm << 4 ); - tmp98__ |= ( pSrc->acbk_aci << 5 ); - tmp98__ |= ( pSrc->unused2 << 7 ); - *pBuf = tmp98__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - tmp99__ = 0U; - tmp99__ |= ( pSrc->acbk_min << 0 ); - tmp99__ |= ( pSrc->acbk_max << 4 ); - *pBuf = tmp99__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; - tmp100__ = 0U; - tmp100__ |= ( pSrc->acvi_aifsn << 0 ); - tmp100__ |= ( pSrc->acvi_acm << 4 ); - tmp100__ |= ( pSrc->acvi_aci << 5 ); - tmp100__ |= ( pSrc->unused3 << 7 ); - *pBuf = tmp100__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - tmp101__ = 0U; - tmp101__ |= ( pSrc->acvi_min << 0 ); - tmp101__ |= ( pSrc->acvi_max << 4 ); - *pBuf = tmp101__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; - tmp102__ = 0U; - tmp102__ |= ( pSrc->acvo_aifsn << 0 ); - tmp102__ |= ( pSrc->acvo_acm << 4 ); - tmp102__ |= ( pSrc->acvo_aci << 5 ); - tmp102__ |= ( pSrc->unused4 << 7 ); - *pBuf = tmp102__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - tmp103__ = 0U; - tmp103__ |= ( pSrc->acvo_min << 0 ); - tmp103__ |= ( pSrc->acvo_max << 4 ); - *pBuf = tmp103__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acvo_txoplimit, 0); - *pnConsumed += 2; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIePropEDCAParams. */ - -tANI_U32 dot11fPackIePropQuietBSS(tpAniSirGlobal pCtx, - tDot11fIEPropQuietBSS *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 6; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 16; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->quiet_count; - *pnConsumed += 1; - pBuf += 1; - *pBuf = pSrc->quiet_period; - *pnConsumed += 1; - pBuf += 1; - frameshtons(pCtx, pBuf, pSrc->quiet_duration, 0); - *pnConsumed += 2; - pBuf += 2; - frameshtons(pCtx, pBuf, pSrc->quiet_offset, 0); - *pnConsumed += 2; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIePropQuietBSS. */ - -tANI_U32 dot11fPackIePropSuppRates(tpAniSirGlobal pCtx, - tDot11fIEPropSuppRates *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += pSrc->num_rates; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 0; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - DOT11F_MEMCPY(pCtx, pBuf, &( pSrc->rates ), pSrc->num_rates); - *pnConsumed += pSrc->num_rates; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIePropSuppRates. */ - tANI_U32 dot11fPackIeR0KH_ID(tpAniSirGlobal pCtx, tDot11fIER0KH_ID *pSrc, tANI_U8 *pBuf, @@ -26568,182 +23804,6 @@ tANI_U32 dot11fPackIeTSFInfo(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11fPackIeTSFInfo. */ -tANI_U32 dot11fPackIeTaurus(tpAniSirGlobal pCtx, - tDot11fIETaurus *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - tANI_U16 tmp104__; - nNeeded += 6; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 18; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - frameshtons(pCtx, pBuf, pSrc->baTIDBitmap, 0); - *pnConsumed += 2; - pBuf += 2; - frameshtons(pCtx, pBuf, pSrc->baPolicy, 0); - *pnConsumed += 2; - pBuf += 2; - tmp104__ = 0U; - tmp104__ |= ( pSrc->baBufferSize << 0 ); - tmp104__ |= ( pSrc->rsvd << 12 ); - frameshtons(pCtx, pBuf, tmp104__, 0); - *pnConsumed += 2; - // fieldsEndFlag = 1 - nBuf -= 2 ; - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeTaurus. */ - -tANI_U32 dot11fPackIeTitan(tpAniSirGlobal pCtx, - tDot11fIETitan *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 4; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 14; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->concat_tcid_bitmap; - *pnConsumed += 1; - pBuf += 1; - *pBuf = pSrc->compression_tcid_bitmap; - *pnConsumed += 1; - pBuf += 1; - *pBuf = pSrc->cb_state; - *pnConsumed += 1; - pBuf += 1; - *pBuf = pSrc->rev_fcs_state; - *pnConsumed += 1; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeTitan. */ - -tANI_U32 dot11fPackIeTriggerStaBgScan(tpAniSirGlobal pCtx, - tDot11fIETriggerStaBgScan *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 1; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 17; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->enable; - *pnConsumed += 1; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeTriggerStaBgScan. */ - -tANI_U32 dot11fPackIeVersion(tpAniSirGlobal pCtx, - tDot11fIEVersion *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += (pSrc->num_build_version + 5); - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 11; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - frameshtonl(pCtx, pBuf, pSrc->chip_rev, 0); - *pnConsumed += 4; - pBuf += 4; - *pBuf = pSrc->card_type; - *pnConsumed += 1; - pBuf += 1; - DOT11F_MEMCPY(pCtx, pBuf, &( pSrc->build_version ), pSrc->num_build_version); - *pnConsumed += pSrc->num_build_version; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeVersion. */ - -tANI_U32 dot11fPackIeWDS(tpAniSirGlobal pCtx, - tDot11fIEWDS *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += pSrc->num_wdsData; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 3; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - DOT11F_MEMCPY(pCtx, pBuf, &( pSrc->wdsData ), pSrc->num_wdsData); - *pnConsumed += pSrc->num_wdsData; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeWDS. */ - tANI_U32 dot11fPackIeAPChannelReport(tpAniSirGlobal pCtx, tDot11fIEAPChannelReport *pSrc, tANI_U8 *pBuf, @@ -27014,11 +24074,11 @@ tANI_U32 dot11fPackIeRRMEnabledCap(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp105__; - tANI_U8 tmp106__; - tANI_U8 tmp107__; - tANI_U8 tmp108__; - tANI_U8 tmp109__; + tANI_U8 tmp87__; + tANI_U8 tmp88__; + tANI_U8 tmp89__; + tANI_U8 tmp90__; + tANI_U8 tmp91__; nNeeded += 5; while ( pSrc->present ) { @@ -27027,57 +24087,57 @@ tANI_U32 dot11fPackIeRRMEnabledCap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp105__ = 0U; - tmp105__ |= ( pSrc->LinkMeasurement << 0 ); - tmp105__ |= ( pSrc->NeighborRpt << 1 ); - tmp105__ |= ( pSrc->parallel << 2 ); - tmp105__ |= ( pSrc->repeated << 3 ); - tmp105__ |= ( pSrc->BeaconPassive << 4 ); - tmp105__ |= ( pSrc->BeaconActive << 5 ); - tmp105__ |= ( pSrc->BeaconTable << 6 ); - tmp105__ |= ( pSrc->BeaconRepCond << 7 ); - *pBuf = tmp105__; + tmp87__ = 0U; + tmp87__ |= ( pSrc->LinkMeasurement << 0 ); + tmp87__ |= ( pSrc->NeighborRpt << 1 ); + tmp87__ |= ( pSrc->parallel << 2 ); + tmp87__ |= ( pSrc->repeated << 3 ); + tmp87__ |= ( pSrc->BeaconPassive << 4 ); + tmp87__ |= ( pSrc->BeaconActive << 5 ); + tmp87__ |= ( pSrc->BeaconTable << 6 ); + tmp87__ |= ( pSrc->BeaconRepCond << 7 ); + *pBuf = tmp87__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp106__ = 0U; - tmp106__ |= ( pSrc->FrameMeasurement << 0 ); - tmp106__ |= ( pSrc->ChannelLoad << 1 ); - tmp106__ |= ( pSrc->NoiseHistogram << 2 ); - tmp106__ |= ( pSrc->statistics << 3 ); - tmp106__ |= ( pSrc->LCIMeasurement << 4 ); - tmp106__ |= ( pSrc->LCIAzimuth << 5 ); - tmp106__ |= ( pSrc->TCMCapability << 6 ); - tmp106__ |= ( pSrc->triggeredTCM << 7 ); - *pBuf = tmp106__; + tmp88__ = 0U; + tmp88__ |= ( pSrc->FrameMeasurement << 0 ); + tmp88__ |= ( pSrc->ChannelLoad << 1 ); + tmp88__ |= ( pSrc->NoiseHistogram << 2 ); + tmp88__ |= ( pSrc->statistics << 3 ); + tmp88__ |= ( pSrc->LCIMeasurement << 4 ); + tmp88__ |= ( pSrc->LCIAzimuth << 5 ); + tmp88__ |= ( pSrc->TCMCapability << 6 ); + tmp88__ |= ( pSrc->triggeredTCM << 7 ); + *pBuf = tmp88__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp107__ = 0U; - tmp107__ |= ( pSrc->APChanReport << 0 ); - tmp107__ |= ( pSrc->RRMMIBEnabled << 1 ); - tmp107__ |= ( pSrc->operatingChanMax << 2 ); - tmp107__ |= ( pSrc->nonOperatinChanMax << 5 ); - *pBuf = tmp107__; + tmp89__ = 0U; + tmp89__ |= ( pSrc->APChanReport << 0 ); + tmp89__ |= ( pSrc->RRMMIBEnabled << 1 ); + tmp89__ |= ( pSrc->operatingChanMax << 2 ); + tmp89__ |= ( pSrc->nonOperatinChanMax << 5 ); + *pBuf = tmp89__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp108__ = 0U; - tmp108__ |= ( pSrc->MeasurementPilot << 0 ); - tmp108__ |= ( pSrc->MeasurementPilotEnabled << 3 ); - tmp108__ |= ( pSrc->NeighborTSFOffset << 4 ); - tmp108__ |= ( pSrc->RCPIMeasurement << 5 ); - tmp108__ |= ( pSrc->RSNIMeasurement << 6 ); - tmp108__ |= ( pSrc->BssAvgAccessDelay << 7 ); - *pBuf = tmp108__; + tmp90__ = 0U; + tmp90__ |= ( pSrc->MeasurementPilot << 0 ); + tmp90__ |= ( pSrc->MeasurementPilotEnabled << 3 ); + tmp90__ |= ( pSrc->NeighborTSFOffset << 4 ); + tmp90__ |= ( pSrc->RCPIMeasurement << 5 ); + tmp90__ |= ( pSrc->RSNIMeasurement << 6 ); + tmp90__ |= ( pSrc->BssAvgAccessDelay << 7 ); + *pBuf = tmp90__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp109__ = 0U; - tmp109__ |= ( pSrc->BSSAvailAdmission << 0 ); - tmp109__ |= ( pSrc->AntennaInformation << 1 ); - tmp109__ |= ( pSrc->reserved << 2 ); - *pBuf = tmp109__; + tmp91__ = 0U; + tmp91__ |= ( pSrc->BSSAvailAdmission << 0 ); + tmp91__ |= ( pSrc->AntennaInformation << 1 ); + tmp91__ |= ( pSrc->reserved << 2 ); + *pBuf = tmp91__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -27160,7 +24220,7 @@ tANI_U32 dot11fPackIeSchedule(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U16 tmp110__; + tANI_U16 tmp92__; nNeeded += 14; while ( pSrc->present ) { @@ -27169,12 +24229,12 @@ tANI_U32 dot11fPackIeSchedule(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp110__ = 0U; - tmp110__ |= ( pSrc->aggregation << 0 ); - tmp110__ |= ( pSrc->tsid << 1 ); - tmp110__ |= ( pSrc->direction << 5 ); - tmp110__ |= ( pSrc->reserved << 7 ); - frameshtons(pCtx, pBuf, tmp110__, 0); + tmp92__ = 0U; + tmp92__ |= ( pSrc->aggregation << 0 ); + tmp92__ |= ( pSrc->tsid << 1 ); + tmp92__ |= ( pSrc->direction << 5 ); + tmp92__ |= ( pSrc->reserved << 7 ); + frameshtons(pCtx, pBuf, tmp92__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -27374,9 +24434,9 @@ tANI_U32 dot11fPackIeTSPEC(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U16 tmp111__; - tANI_U8 tmp112__; - tANI_U16 tmp113__; + tANI_U16 tmp93__; + tANI_U8 tmp94__; + tANI_U16 tmp95__; nNeeded += 55; while ( pSrc->present ) { @@ -27385,30 +24445,30 @@ tANI_U32 dot11fPackIeTSPEC(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp111__ = 0U; - tmp111__ |= ( pSrc->traffic_type << 0 ); - tmp111__ |= ( pSrc->tsid << 1 ); - tmp111__ |= ( pSrc->direction << 5 ); - tmp111__ |= ( pSrc->access_policy << 7 ); - tmp111__ |= ( pSrc->aggregation << 9 ); - tmp111__ |= ( pSrc->psb << 10 ); - tmp111__ |= ( pSrc->user_priority << 11 ); - tmp111__ |= ( pSrc->tsinfo_ack_pol << 14 ); - frameshtons(pCtx, pBuf, tmp111__, 0); + tmp93__ = 0U; + tmp93__ |= ( pSrc->traffic_type << 0 ); + tmp93__ |= ( pSrc->tsid << 1 ); + tmp93__ |= ( pSrc->direction << 5 ); + tmp93__ |= ( pSrc->access_policy << 7 ); + tmp93__ |= ( pSrc->aggregation << 9 ); + tmp93__ |= ( pSrc->psb << 10 ); + tmp93__ |= ( pSrc->user_priority << 11 ); + tmp93__ |= ( pSrc->tsinfo_ack_pol << 14 ); + frameshtons(pCtx, pBuf, tmp93__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp112__ = 0U; - tmp112__ |= ( pSrc->schedule << 0 ); - tmp112__ |= ( pSrc->unused << 1 ); - *pBuf = tmp112__; + tmp94__ = 0U; + tmp94__ |= ( pSrc->schedule << 0 ); + tmp94__ |= ( pSrc->unused << 1 ); + *pBuf = tmp94__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp113__ = 0U; - tmp113__ |= ( pSrc->size << 0 ); - tmp113__ |= ( pSrc->fixed << 15 ); - frameshtons(pCtx, pBuf, tmp113__, 0); + tmp95__ = 0U; + tmp95__ |= ( pSrc->size << 0 ); + tmp95__ |= ( pSrc->fixed << 15 ); + frameshtons(pCtx, pBuf, tmp95__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -27473,7 +24533,7 @@ tANI_U32 dot11fPackIeWMMSchedule(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U16 tmp114__; + tANI_U16 tmp96__; nNeeded += 15; while ( pSrc->present ) { @@ -27495,12 +24555,12 @@ tANI_U32 dot11fPackIeWMMSchedule(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp114__ = 0U; - tmp114__ |= ( pSrc->aggregation << 0 ); - tmp114__ |= ( pSrc->tsid << 1 ); - tmp114__ |= ( pSrc->direction << 5 ); - tmp114__ |= ( pSrc->reserved << 7 ); - frameshtons(pCtx, pBuf, tmp114__, 0); + tmp96__ = 0U; + tmp96__ |= ( pSrc->aggregation << 0 ); + tmp96__ |= ( pSrc->tsid << 1 ); + tmp96__ |= ( pSrc->direction << 5 ); + tmp96__ |= ( pSrc->reserved << 7 ); + frameshtons(pCtx, pBuf, tmp96__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -27739,9 +24799,9 @@ tANI_U32 dot11fPackIeWMMTSPEC(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U16 tmp115__; - tANI_U8 tmp116__; - tANI_U16 tmp117__; + tANI_U16 tmp97__; + tANI_U8 tmp98__; + tANI_U16 tmp99__; nNeeded += 38; while ( pSrc->present ) { @@ -27763,30 +24823,30 @@ tANI_U32 dot11fPackIeWMMTSPEC(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp115__ = 0U; - tmp115__ |= ( pSrc->traffic_type << 0 ); - tmp115__ |= ( pSrc->tsid << 1 ); - tmp115__ |= ( pSrc->direction << 5 ); - tmp115__ |= ( pSrc->access_policy << 7 ); - tmp115__ |= ( pSrc->aggregation << 9 ); - tmp115__ |= ( pSrc->psb << 10 ); - tmp115__ |= ( pSrc->user_priority << 11 ); - tmp115__ |= ( pSrc->tsinfo_ack_pol << 14 ); - frameshtons(pCtx, pBuf, tmp115__, 0); + tmp97__ = 0U; + tmp97__ |= ( pSrc->traffic_type << 0 ); + tmp97__ |= ( pSrc->tsid << 1 ); + tmp97__ |= ( pSrc->direction << 5 ); + tmp97__ |= ( pSrc->access_policy << 7 ); + tmp97__ |= ( pSrc->aggregation << 9 ); + tmp97__ |= ( pSrc->psb << 10 ); + tmp97__ |= ( pSrc->user_priority << 11 ); + tmp97__ |= ( pSrc->tsinfo_ack_pol << 14 ); + frameshtons(pCtx, pBuf, tmp97__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp116__ = 0U; - tmp116__ |= ( pSrc->tsinfo_rsvd << 0 ); - tmp116__ |= ( pSrc->burst_size_defn << 7 ); - *pBuf = tmp116__; + tmp98__ = 0U; + tmp98__ |= ( pSrc->tsinfo_rsvd << 0 ); + tmp98__ |= ( pSrc->burst_size_defn << 7 ); + *pBuf = tmp98__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp117__ = 0U; - tmp117__ |= ( pSrc->size << 0 ); - tmp117__ |= ( pSrc->fixed << 15 ); - frameshtons(pCtx, pBuf, tmp117__, 0); + tmp99__ = 0U; + tmp99__ |= ( pSrc->size << 0 ); + tmp99__ |= ( pSrc->fixed << 15 ); + frameshtons(pCtx, pBuf, tmp99__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -27908,48 +24968,6 @@ tANI_U32 dot11fPackIeAID(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11fPackIeAID. */ -tANI_U32 dot11fPackIeAirgo(tpAniSirGlobal pCtx, - tDot11fIEAirgo *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - tANI_U32 status = DOT11F_PARSE_SUCCESS; - status = dot11fGetPackedIEAirgo(pCtx, pSrc, &nNeeded); - if ( ! DOT11F_SUCCEEDED( status ) ) return status; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 221; - ++pBuf; --nBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; --nBuf; ++(*pnConsumed); - *pBuf = 0x0; - ++pBuf; --nBuf; ++(*pnConsumed); - *pBuf = 0xa; - ++pBuf; --nBuf; ++(*pnConsumed); - *pBuf = 0xf5; - ++pBuf; --nBuf; ++(*pnConsumed); - status = PackCore(pCtx, - (tANI_U8*)pSrc, - pBuf, - nBuf, - pnConsumed, - FFS_Airgo, - IES_Airgo); - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return status; -} /* End dot11fPackIeAirgo. */ - tANI_U32 dot11fPackIeCFParams(tpAniSirGlobal pCtx, tDot11fIECFParams *pSrc, tANI_U8 *pBuf, @@ -28168,14 +25186,14 @@ tANI_U32 dot11fPackIeEDCAParamSet(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp118__; - tANI_U8 tmp119__; - tANI_U8 tmp120__; - tANI_U8 tmp121__; - tANI_U8 tmp122__; - tANI_U8 tmp123__; - tANI_U8 tmp124__; - tANI_U8 tmp125__; + tANI_U8 tmp100__; + tANI_U8 tmp101__; + tANI_U8 tmp102__; + tANI_U8 tmp103__; + tANI_U8 tmp104__; + tANI_U8 tmp105__; + tANI_U8 tmp106__; + tANI_U8 tmp107__; nNeeded += 18; while ( pSrc->present ) { @@ -28190,76 +25208,76 @@ tANI_U32 dot11fPackIeEDCAParamSet(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved; *pnConsumed += 1; pBuf += 1; - tmp118__ = 0U; - tmp118__ |= ( pSrc->acbe_aifsn << 0 ); - tmp118__ |= ( pSrc->acbe_acm << 4 ); - tmp118__ |= ( pSrc->acbe_aci << 5 ); - tmp118__ |= ( pSrc->unused1 << 7 ); - *pBuf = tmp118__; + tmp100__ = 0U; + tmp100__ |= ( pSrc->acbe_aifsn << 0 ); + tmp100__ |= ( pSrc->acbe_acm << 4 ); + tmp100__ |= ( pSrc->acbe_aci << 5 ); + tmp100__ |= ( pSrc->unused1 << 7 ); + *pBuf = tmp100__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp119__ = 0U; - tmp119__ |= ( pSrc->acbe_acwmin << 0 ); - tmp119__ |= ( pSrc->acbe_acwmax << 4 ); - *pBuf = tmp119__; + tmp101__ = 0U; + tmp101__ |= ( pSrc->acbe_acwmin << 0 ); + tmp101__ |= ( pSrc->acbe_acwmax << 4 ); + *pBuf = tmp101__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp120__ = 0U; - tmp120__ |= ( pSrc->acbk_aifsn << 0 ); - tmp120__ |= ( pSrc->acbk_acm << 4 ); - tmp120__ |= ( pSrc->acbk_aci << 5 ); - tmp120__ |= ( pSrc->unused2 << 7 ); - *pBuf = tmp120__; + tmp102__ = 0U; + tmp102__ |= ( pSrc->acbk_aifsn << 0 ); + tmp102__ |= ( pSrc->acbk_acm << 4 ); + tmp102__ |= ( pSrc->acbk_aci << 5 ); + tmp102__ |= ( pSrc->unused2 << 7 ); + *pBuf = tmp102__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp121__ = 0U; - tmp121__ |= ( pSrc->acbk_acwmin << 0 ); - tmp121__ |= ( pSrc->acbk_acwmax << 4 ); - *pBuf = tmp121__; + tmp103__ = 0U; + tmp103__ |= ( pSrc->acbk_acwmin << 0 ); + tmp103__ |= ( pSrc->acbk_acwmax << 4 ); + *pBuf = tmp103__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp122__ = 0U; - tmp122__ |= ( pSrc->acvi_aifsn << 0 ); - tmp122__ |= ( pSrc->acvi_acm << 4 ); - tmp122__ |= ( pSrc->acvi_aci << 5 ); - tmp122__ |= ( pSrc->unused3 << 7 ); - *pBuf = tmp122__; + tmp104__ = 0U; + tmp104__ |= ( pSrc->acvi_aifsn << 0 ); + tmp104__ |= ( pSrc->acvi_acm << 4 ); + tmp104__ |= ( pSrc->acvi_aci << 5 ); + tmp104__ |= ( pSrc->unused3 << 7 ); + *pBuf = tmp104__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp123__ = 0U; - tmp123__ |= ( pSrc->acvi_acwmin << 0 ); - tmp123__ |= ( pSrc->acvi_acwmax << 4 ); - *pBuf = tmp123__; + tmp105__ = 0U; + tmp105__ |= ( pSrc->acvi_acwmin << 0 ); + tmp105__ |= ( pSrc->acvi_acwmax << 4 ); + *pBuf = tmp105__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp124__ = 0U; - tmp124__ |= ( pSrc->acvo_aifsn << 0 ); - tmp124__ |= ( pSrc->acvo_acm << 4 ); - tmp124__ |= ( pSrc->acvo_aci << 5 ); - tmp124__ |= ( pSrc->unused4 << 7 ); - *pBuf = tmp124__; + tmp106__ = 0U; + tmp106__ |= ( pSrc->acvo_aifsn << 0 ); + tmp106__ |= ( pSrc->acvo_acm << 4 ); + tmp106__ |= ( pSrc->acvo_aci << 5 ); + tmp106__ |= ( pSrc->unused4 << 7 ); + *pBuf = tmp106__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp125__ = 0U; - tmp125__ |= ( pSrc->acvo_acwmin << 0 ); - tmp125__ |= ( pSrc->acvo_acwmax << 4 ); - *pBuf = tmp125__; + tmp107__ = 0U; + tmp107__ |= ( pSrc->acvo_acwmin << 0 ); + tmp107__ |= ( pSrc->acvo_acwmax << 4 ); + *pBuf = tmp107__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -28285,7 +25303,7 @@ tANI_U32 dot11fPackIeERPInfo(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp126__; + tANI_U8 tmp108__; nNeeded += 1; while ( pSrc->present ) { @@ -28294,12 +25312,12 @@ tANI_U32 dot11fPackIeERPInfo(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp126__ = 0U; - tmp126__ |= ( pSrc->non_erp_present << 0 ); - tmp126__ |= ( pSrc->use_prot << 1 ); - tmp126__ |= ( pSrc->barker_preamble << 2 ); - tmp126__ |= ( pSrc->unused << 3 ); - *pBuf = tmp126__; + tmp108__ = 0U; + tmp108__ |= ( pSrc->non_erp_present << 0 ); + tmp108__ |= ( pSrc->use_prot << 1 ); + tmp108__ |= ( pSrc->barker_preamble << 2 ); + tmp108__ |= ( pSrc->unused << 3 ); + *pBuf = tmp108__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -28360,7 +25378,7 @@ tANI_U32 dot11fPackIeESERadMgmtCap(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp127__; + tANI_U8 tmp109__; nNeeded += 2; while ( pSrc->present ) { @@ -28380,10 +25398,10 @@ tANI_U32 dot11fPackIeESERadMgmtCap(tpAniSirGlobal pCtx, *pBuf = pSrc->mgmt_state; *pnConsumed += 1; pBuf += 1; - tmp127__ = 0U; - tmp127__ |= ( pSrc->mbssid_mask << 0 ); - tmp127__ |= ( pSrc->reserved << 3 ); - *pBuf = tmp127__; + tmp109__ = 0U; + tmp109__ |= ( pSrc->mbssid_mask << 0 ); + tmp109__ |= ( pSrc->reserved << 3 ); + *pBuf = tmp109__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -28570,15 +25588,15 @@ tANI_U32 dot11fPackIeExtCap(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp128__; - tANI_U8 tmp129__; - tANI_U8 tmp130__; - tANI_U8 tmp131__; - tANI_U8 tmp132__; - tANI_U8 tmp133__; - tANI_U8 tmp134__; - tANI_U8 tmp135__; - tANI_U8 tmp136__; + tANI_U8 tmp110__; + tANI_U8 tmp111__; + tANI_U8 tmp112__; + tANI_U8 tmp113__; + tANI_U8 tmp114__; + tANI_U8 tmp115__; + tANI_U8 tmp116__; + tANI_U8 tmp117__; + tANI_U8 tmp118__; nNeeded += 9; while ( pSrc->present ) { @@ -28587,118 +25605,118 @@ tANI_U32 dot11fPackIeExtCap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp128__ = 0U; - tmp128__ |= ( pSrc->bssCoexistMgmtSupport << 0 ); - tmp128__ |= ( pSrc->reserved1 << 1 ); - tmp128__ |= ( pSrc->extChanSwitch << 2 ); - tmp128__ |= ( pSrc->reserved2 << 3 ); - tmp128__ |= ( pSrc->psmpCap << 4 ); - tmp128__ |= ( pSrc->reserved3 << 5 ); - tmp128__ |= ( pSrc->spsmpCap << 6 ); - tmp128__ |= ( pSrc->event << 7 ); - *pBuf = tmp128__; + tmp110__ = 0U; + tmp110__ |= ( pSrc->bssCoexistMgmtSupport << 0 ); + tmp110__ |= ( pSrc->reserved1 << 1 ); + tmp110__ |= ( pSrc->extChanSwitch << 2 ); + tmp110__ |= ( pSrc->reserved2 << 3 ); + tmp110__ |= ( pSrc->psmpCap << 4 ); + tmp110__ |= ( pSrc->reserved3 << 5 ); + tmp110__ |= ( pSrc->spsmpCap << 6 ); + tmp110__ |= ( pSrc->event << 7 ); + *pBuf = tmp110__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp129__ = 0U; - tmp129__ |= ( pSrc->diagnostics << 0 ); - tmp129__ |= ( pSrc->multiDiagnostics << 1 ); - tmp129__ |= ( pSrc->locTracking << 2 ); - tmp129__ |= ( pSrc->FMS << 3 ); - tmp129__ |= ( pSrc->proxyARPService << 4 ); - tmp129__ |= ( pSrc->coLocIntfReporting << 5 ); - tmp129__ |= ( pSrc->civicLoc << 6 ); - tmp129__ |= ( pSrc->geospatialLoc << 7 ); - *pBuf = tmp129__; + tmp111__ = 0U; + tmp111__ |= ( pSrc->diagnostics << 0 ); + tmp111__ |= ( pSrc->multiDiagnostics << 1 ); + tmp111__ |= ( pSrc->locTracking << 2 ); + tmp111__ |= ( pSrc->FMS << 3 ); + tmp111__ |= ( pSrc->proxyARPService << 4 ); + tmp111__ |= ( pSrc->coLocIntfReporting << 5 ); + tmp111__ |= ( pSrc->civicLoc << 6 ); + tmp111__ |= ( pSrc->geospatialLoc << 7 ); + *pBuf = tmp111__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp130__ = 0U; - tmp130__ |= ( pSrc->TFS << 0 ); - tmp130__ |= ( pSrc->wnmSleepMode << 1 ); - tmp130__ |= ( pSrc->timBroadcast << 2 ); - tmp130__ |= ( pSrc->bssTransition << 3 ); - tmp130__ |= ( pSrc->qosTrafficCap << 4 ); - tmp130__ |= ( pSrc->acStaCnt << 5 ); - tmp130__ |= ( pSrc->multiBSSID << 6 ); - tmp130__ |= ( pSrc->timingMeas << 7 ); - *pBuf = tmp130__; + tmp112__ = 0U; + tmp112__ |= ( pSrc->TFS << 0 ); + tmp112__ |= ( pSrc->wnmSleepMode << 1 ); + tmp112__ |= ( pSrc->timBroadcast << 2 ); + tmp112__ |= ( pSrc->bssTransition << 3 ); + tmp112__ |= ( pSrc->qosTrafficCap << 4 ); + tmp112__ |= ( pSrc->acStaCnt << 5 ); + tmp112__ |= ( pSrc->multiBSSID << 6 ); + tmp112__ |= ( pSrc->timingMeas << 7 ); + *pBuf = tmp112__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp131__ = 0U; - tmp131__ |= ( pSrc->chanUsage << 0 ); - tmp131__ |= ( pSrc->ssidList << 1 ); - tmp131__ |= ( pSrc->DMS << 2 ); - tmp131__ |= ( pSrc->UTCTSFOffset << 3 ); - tmp131__ |= ( pSrc->TDLSPeerUAPSDBufferSTA << 4 ); - tmp131__ |= ( pSrc->TDLSPeerPSMSupp << 5 ); - tmp131__ |= ( pSrc->TDLSChannelSwitching << 6 ); - tmp131__ |= ( pSrc->interworkingService << 7 ); - *pBuf = tmp131__; + tmp113__ = 0U; + tmp113__ |= ( pSrc->chanUsage << 0 ); + tmp113__ |= ( pSrc->ssidList << 1 ); + tmp113__ |= ( pSrc->DMS << 2 ); + tmp113__ |= ( pSrc->UTCTSFOffset << 3 ); + tmp113__ |= ( pSrc->TDLSPeerUAPSDBufferSTA << 4 ); + tmp113__ |= ( pSrc->TDLSPeerPSMSupp << 5 ); + tmp113__ |= ( pSrc->TDLSChannelSwitching << 6 ); + tmp113__ |= ( pSrc->interworkingService << 7 ); + *pBuf = tmp113__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp132__ = 0U; - tmp132__ |= ( pSrc->qosMap << 0 ); - tmp132__ |= ( pSrc->EBR << 1 ); - tmp132__ |= ( pSrc->sspnInterface << 2 ); - tmp132__ |= ( pSrc->reserved4 << 3 ); - tmp132__ |= ( pSrc->msgCFCap << 4 ); - tmp132__ |= ( pSrc->TDLSSupport << 5 ); - tmp132__ |= ( pSrc->TDLSProhibited << 6 ); - tmp132__ |= ( pSrc->TDLSChanSwitProhibited << 7 ); - *pBuf = tmp132__; + tmp114__ = 0U; + tmp114__ |= ( pSrc->qosMap << 0 ); + tmp114__ |= ( pSrc->EBR << 1 ); + tmp114__ |= ( pSrc->sspnInterface << 2 ); + tmp114__ |= ( pSrc->reserved4 << 3 ); + tmp114__ |= ( pSrc->msgCFCap << 4 ); + tmp114__ |= ( pSrc->TDLSSupport << 5 ); + tmp114__ |= ( pSrc->TDLSProhibited << 6 ); + tmp114__ |= ( pSrc->TDLSChanSwitProhibited << 7 ); + *pBuf = tmp114__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp133__ = 0U; - tmp133__ |= ( pSrc->rejectUnadmittedTraffic << 0 ); - tmp133__ |= ( pSrc->serviceIntervalGranularity << 1 ); - tmp133__ |= ( pSrc->identifierLoc << 4 ); - tmp133__ |= ( pSrc->uapsdCoexistence << 5 ); - tmp133__ |= ( pSrc->wnmNotification << 6 ); - tmp133__ |= ( pSrc->QABcapbility << 7 ); - *pBuf = tmp133__; + tmp115__ = 0U; + tmp115__ |= ( pSrc->rejectUnadmittedTraffic << 0 ); + tmp115__ |= ( pSrc->serviceIntervalGranularity << 1 ); + tmp115__ |= ( pSrc->identifierLoc << 4 ); + tmp115__ |= ( pSrc->uapsdCoexistence << 5 ); + tmp115__ |= ( pSrc->wnmNotification << 6 ); + tmp115__ |= ( pSrc->QABcapbility << 7 ); + *pBuf = tmp115__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp134__ = 0U; - tmp134__ |= ( pSrc->UTF8SSID << 0 ); - tmp134__ |= ( pSrc->QMFActivated << 1 ); - tmp134__ |= ( pSrc->QMFreconAct << 2 ); - tmp134__ |= ( pSrc->RobustAVStreaming << 3 ); - tmp134__ |= ( pSrc->AdvancedGCR << 4 ); - tmp134__ |= ( pSrc->MeshGCR << 5 ); - tmp134__ |= ( pSrc->SCS << 6 ); - tmp134__ |= ( pSrc->QLoadReport << 7 ); - *pBuf = tmp134__; + tmp116__ = 0U; + tmp116__ |= ( pSrc->UTF8SSID << 0 ); + tmp116__ |= ( pSrc->QMFActivated << 1 ); + tmp116__ |= ( pSrc->QMFreconAct << 2 ); + tmp116__ |= ( pSrc->RobustAVStreaming << 3 ); + tmp116__ |= ( pSrc->AdvancedGCR << 4 ); + tmp116__ |= ( pSrc->MeshGCR << 5 ); + tmp116__ |= ( pSrc->SCS << 6 ); + tmp116__ |= ( pSrc->QLoadReport << 7 ); + *pBuf = tmp116__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp135__ = 0U; - tmp135__ |= ( pSrc->AlternateEDCA << 0 ); - tmp135__ |= ( pSrc->UnprotTXOPneg << 1 ); - tmp135__ |= ( pSrc->ProtTXOPneg << 2 ); - tmp135__ |= ( pSrc->reserved6 << 3 ); - tmp135__ |= ( pSrc->ProtQLoadReport << 4 ); - tmp135__ |= ( pSrc->TDLSWiderBW << 5 ); - tmp135__ |= ( pSrc->operModeNotification << 6 ); - tmp135__ |= ( pSrc->maxNumOfMSDU_bit1 << 7 ); - *pBuf = tmp135__; + tmp117__ = 0U; + tmp117__ |= ( pSrc->AlternateEDCA << 0 ); + tmp117__ |= ( pSrc->UnprotTXOPneg << 1 ); + tmp117__ |= ( pSrc->ProtTXOPneg << 2 ); + tmp117__ |= ( pSrc->reserved6 << 3 ); + tmp117__ |= ( pSrc->ProtQLoadReport << 4 ); + tmp117__ |= ( pSrc->TDLSWiderBW << 5 ); + tmp117__ |= ( pSrc->operModeNotification << 6 ); + tmp117__ |= ( pSrc->maxNumOfMSDU_bit1 << 7 ); + *pBuf = tmp117__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp136__ = 0U; - tmp136__ |= ( pSrc->maxNumOfMSDU_bit2 << 0 ); - tmp136__ |= ( pSrc->ChanSchMgmt << 1 ); - tmp136__ |= ( pSrc->GeoDBInbandEnSignal << 2 ); - tmp136__ |= ( pSrc->NwChanControl << 3 ); - tmp136__ |= ( pSrc->WhiteSpaceMap << 4 ); - tmp136__ |= ( pSrc->ChanAvailQuery << 5 ); - tmp136__ |= ( pSrc->fineTimingMeas << 6 ); - tmp136__ |= ( pSrc->reserved7 << 7 ); - *pBuf = tmp136__; + tmp118__ = 0U; + tmp118__ |= ( pSrc->maxNumOfMSDU_bit2 << 0 ); + tmp118__ |= ( pSrc->ChanSchMgmt << 1 ); + tmp118__ |= ( pSrc->GeoDBInbandEnSignal << 2 ); + tmp118__ |= ( pSrc->NwChanControl << 3 ); + tmp118__ |= ( pSrc->WhiteSpaceMap << 4 ); + tmp118__ |= ( pSrc->ChanAvailQuery << 5 ); + tmp118__ |= ( pSrc->fineTimingMeas << 6 ); + tmp118__ |= ( pSrc->reserved7 << 7 ); + *pBuf = tmp118__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -28895,7 +25913,7 @@ tANI_U32 dot11fPackIeFTInfo(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U16 tmp137__; + tANI_U16 tmp119__; tANI_U32 status = DOT11F_PARSE_SUCCESS; status = dot11fGetPackedIEFTInfo(pCtx, pSrc, &nNeeded); if ( ! DOT11F_SUCCEEDED( status ) ) return status; @@ -28906,10 +25924,10 @@ tANI_U32 dot11fPackIeFTInfo(tpAniSirGlobal pCtx, ++pBuf; --nBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; --nBuf; ++(*pnConsumed); - tmp137__ = 0U; - tmp137__ |= ( pSrc->reserved << 0 ); - tmp137__ |= ( pSrc->IECount << 8 ); - frameshtons(pCtx, pBuf, tmp137__, 0); + tmp119__ = 0U; + tmp119__ |= ( pSrc->reserved << 0 ); + tmp119__ |= ( pSrc->IECount << 8 ); + frameshtons(pCtx, pBuf, tmp119__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -28948,11 +25966,11 @@ tANI_U32 dot11fPackIeHTCaps(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U16 tmp138__; - tANI_U8 tmp139__; - tANI_U16 tmp140__; - tANI_U32 tmp141__; - tANI_U8 tmp142__; + tANI_U16 tmp120__; + tANI_U8 tmp121__; + tANI_U16 tmp122__; + tANI_U32 tmp123__; + tANI_U8 tmp124__; nNeeded += (pSrc->num_rsvd + 26); while ( pSrc->present ) { @@ -28961,77 +25979,77 @@ tANI_U32 dot11fPackIeHTCaps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp138__ = 0U; - tmp138__ |= ( pSrc->advCodingCap << 0 ); - tmp138__ |= ( pSrc->supportedChannelWidthSet << 1 ); - tmp138__ |= ( pSrc->mimoPowerSave << 2 ); - tmp138__ |= ( pSrc->greenField << 4 ); - tmp138__ |= ( pSrc->shortGI20MHz << 5 ); - tmp138__ |= ( pSrc->shortGI40MHz << 6 ); - tmp138__ |= ( pSrc->txSTBC << 7 ); - tmp138__ |= ( pSrc->rxSTBC << 8 ); - tmp138__ |= ( pSrc->delayedBA << 10 ); - tmp138__ |= ( pSrc->maximalAMSDUsize << 11 ); - tmp138__ |= ( pSrc->dsssCckMode40MHz << 12 ); - tmp138__ |= ( pSrc->psmp << 13 ); - tmp138__ |= ( pSrc->stbcControlFrame << 14 ); - tmp138__ |= ( pSrc->lsigTXOPProtection << 15 ); - frameshtons(pCtx, pBuf, tmp138__, 0); + tmp120__ = 0U; + tmp120__ |= ( pSrc->advCodingCap << 0 ); + tmp120__ |= ( pSrc->supportedChannelWidthSet << 1 ); + tmp120__ |= ( pSrc->mimoPowerSave << 2 ); + tmp120__ |= ( pSrc->greenField << 4 ); + tmp120__ |= ( pSrc->shortGI20MHz << 5 ); + tmp120__ |= ( pSrc->shortGI40MHz << 6 ); + tmp120__ |= ( pSrc->txSTBC << 7 ); + tmp120__ |= ( pSrc->rxSTBC << 8 ); + tmp120__ |= ( pSrc->delayedBA << 10 ); + tmp120__ |= ( pSrc->maximalAMSDUsize << 11 ); + tmp120__ |= ( pSrc->dsssCckMode40MHz << 12 ); + tmp120__ |= ( pSrc->psmp << 13 ); + tmp120__ |= ( pSrc->stbcControlFrame << 14 ); + tmp120__ |= ( pSrc->lsigTXOPProtection << 15 ); + frameshtons(pCtx, pBuf, tmp120__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp139__ = 0U; - tmp139__ |= ( pSrc->maxRxAMPDUFactor << 0 ); - tmp139__ |= ( pSrc->mpduDensity << 2 ); - tmp139__ |= ( pSrc->reserved1 << 5 ); - *pBuf = tmp139__; + tmp121__ = 0U; + tmp121__ |= ( pSrc->maxRxAMPDUFactor << 0 ); + tmp121__ |= ( pSrc->mpduDensity << 2 ); + tmp121__ |= ( pSrc->reserved1 << 5 ); + *pBuf = tmp121__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; DOT11F_MEMCPY(pCtx, pBuf, pSrc->supportedMCSSet, 16); *pnConsumed += 16; pBuf += 16; - tmp140__ = 0U; - tmp140__ |= ( pSrc->pco << 0 ); - tmp140__ |= ( pSrc->transitionTime << 1 ); - tmp140__ |= ( pSrc->reserved2 << 3 ); - tmp140__ |= ( pSrc->mcsFeedback << 8 ); - tmp140__ |= ( pSrc->reserved3 << 10 ); - frameshtons(pCtx, pBuf, tmp140__, 0); + tmp122__ = 0U; + tmp122__ |= ( pSrc->pco << 0 ); + tmp122__ |= ( pSrc->transitionTime << 1 ); + tmp122__ |= ( pSrc->reserved2 << 3 ); + tmp122__ |= ( pSrc->mcsFeedback << 8 ); + tmp122__ |= ( pSrc->reserved3 << 10 ); + frameshtons(pCtx, pBuf, tmp122__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp141__ = 0U; - tmp141__ |= ( pSrc->txBF << 0 ); - tmp141__ |= ( pSrc->rxStaggeredSounding << 1 ); - tmp141__ |= ( pSrc->txStaggeredSounding << 2 ); - tmp141__ |= ( pSrc->rxZLF << 3 ); - tmp141__ |= ( pSrc->txZLF << 4 ); - tmp141__ |= ( pSrc->implicitTxBF << 5 ); - tmp141__ |= ( pSrc->calibration << 6 ); - tmp141__ |= ( pSrc->explicitCSITxBF << 8 ); - tmp141__ |= ( pSrc->explicitUncompressedSteeringMatrix << 9 ); - tmp141__ |= ( pSrc->explicitBFCSIFeedback << 10 ); - tmp141__ |= ( pSrc->explicitUncompressedSteeringMatrixFeedback << 13 ); - tmp141__ |= ( pSrc->explicitCompressedSteeringMatrixFeedback << 16 ); - tmp141__ |= ( pSrc->csiNumBFAntennae << 19 ); - tmp141__ |= ( pSrc->uncompressedSteeringMatrixBFAntennae << 21 ); - tmp141__ |= ( pSrc->compressedSteeringMatrixBFAntennae << 23 ); - tmp141__ |= ( pSrc->reserved4 << 25 ); - frameshtonl(pCtx, pBuf, tmp141__, 0); + tmp123__ = 0U; + tmp123__ |= ( pSrc->txBF << 0 ); + tmp123__ |= ( pSrc->rxStaggeredSounding << 1 ); + tmp123__ |= ( pSrc->txStaggeredSounding << 2 ); + tmp123__ |= ( pSrc->rxZLF << 3 ); + tmp123__ |= ( pSrc->txZLF << 4 ); + tmp123__ |= ( pSrc->implicitTxBF << 5 ); + tmp123__ |= ( pSrc->calibration << 6 ); + tmp123__ |= ( pSrc->explicitCSITxBF << 8 ); + tmp123__ |= ( pSrc->explicitUncompressedSteeringMatrix << 9 ); + tmp123__ |= ( pSrc->explicitBFCSIFeedback << 10 ); + tmp123__ |= ( pSrc->explicitUncompressedSteeringMatrixFeedback << 13 ); + tmp123__ |= ( pSrc->explicitCompressedSteeringMatrixFeedback << 16 ); + tmp123__ |= ( pSrc->csiNumBFAntennae << 19 ); + tmp123__ |= ( pSrc->uncompressedSteeringMatrixBFAntennae << 21 ); + tmp123__ |= ( pSrc->compressedSteeringMatrixBFAntennae << 23 ); + tmp123__ |= ( pSrc->reserved4 << 25 ); + frameshtonl(pCtx, pBuf, tmp123__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; - tmp142__ = 0U; - tmp142__ |= ( pSrc->antennaSelection << 0 ); - tmp142__ |= ( pSrc->explicitCSIFeedbackTx << 1 ); - tmp142__ |= ( pSrc->antennaIndicesFeedbackTx << 2 ); - tmp142__ |= ( pSrc->explicitCSIFeedback << 3 ); - tmp142__ |= ( pSrc->antennaIndicesFeedback << 4 ); - tmp142__ |= ( pSrc->rxAS << 5 ); - tmp142__ |= ( pSrc->txSoundingPPDUs << 6 ); - tmp142__ |= ( pSrc->reserved5 << 7 ); - *pBuf = tmp142__; + tmp124__ = 0U; + tmp124__ |= ( pSrc->antennaSelection << 0 ); + tmp124__ |= ( pSrc->explicitCSIFeedbackTx << 1 ); + tmp124__ |= ( pSrc->antennaIndicesFeedbackTx << 2 ); + tmp124__ |= ( pSrc->explicitCSIFeedback << 3 ); + tmp124__ |= ( pSrc->antennaIndicesFeedback << 4 ); + tmp124__ |= ( pSrc->rxAS << 5 ); + tmp124__ |= ( pSrc->txSoundingPPDUs << 6 ); + tmp124__ |= ( pSrc->reserved5 << 7 ); + *pBuf = tmp124__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -29057,9 +26075,9 @@ tANI_U32 dot11fPackIeHTInfo(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp143__; - tANI_U16 tmp144__; - tANI_U16 tmp145__; + tANI_U8 tmp125__; + tANI_U16 tmp126__; + tANI_U16 tmp127__; nNeeded += (pSrc->num_rsvd + 22); while ( pSrc->present ) { @@ -29071,35 +26089,35 @@ tANI_U32 dot11fPackIeHTInfo(tpAniSirGlobal pCtx, *pBuf = pSrc->primaryChannel; *pnConsumed += 1; pBuf += 1; - tmp143__ = 0U; - tmp143__ |= ( pSrc->secondaryChannelOffset << 0 ); - tmp143__ |= ( pSrc->recommendedTxWidthSet << 2 ); - tmp143__ |= ( pSrc->rifsMode << 3 ); - tmp143__ |= ( pSrc->controlledAccessOnly << 4 ); - tmp143__ |= ( pSrc->serviceIntervalGranularity << 5 ); - *pBuf = tmp143__; + tmp125__ = 0U; + tmp125__ |= ( pSrc->secondaryChannelOffset << 0 ); + tmp125__ |= ( pSrc->recommendedTxWidthSet << 2 ); + tmp125__ |= ( pSrc->rifsMode << 3 ); + tmp125__ |= ( pSrc->controlledAccessOnly << 4 ); + tmp125__ |= ( pSrc->serviceIntervalGranularity << 5 ); + *pBuf = tmp125__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp144__ = 0U; - tmp144__ |= ( pSrc->opMode << 0 ); - tmp144__ |= ( pSrc->nonGFDevicesPresent << 2 ); - tmp144__ |= ( pSrc->transmitBurstLimit << 3 ); - tmp144__ |= ( pSrc->obssNonHTStaPresent << 4 ); - tmp144__ |= ( pSrc->reserved << 5 ); - frameshtons(pCtx, pBuf, tmp144__, 0); + tmp126__ = 0U; + tmp126__ |= ( pSrc->opMode << 0 ); + tmp126__ |= ( pSrc->nonGFDevicesPresent << 2 ); + tmp126__ |= ( pSrc->transmitBurstLimit << 3 ); + tmp126__ |= ( pSrc->obssNonHTStaPresent << 4 ); + tmp126__ |= ( pSrc->reserved << 5 ); + frameshtons(pCtx, pBuf, tmp126__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp145__ = 0U; - tmp145__ |= ( pSrc->basicSTBCMCS << 0 ); - tmp145__ |= ( pSrc->dualCTSProtection << 7 ); - tmp145__ |= ( pSrc->secondaryBeacon << 8 ); - tmp145__ |= ( pSrc->lsigTXOPProtectionFullSupport << 9 ); - tmp145__ |= ( pSrc->pcoActive << 10 ); - tmp145__ |= ( pSrc->pcoPhase << 11 ); - tmp145__ |= ( pSrc->reserved2 << 12 ); - frameshtons(pCtx, pBuf, tmp145__, 0); + tmp127__ = 0U; + tmp127__ |= ( pSrc->basicSTBCMCS << 0 ); + tmp127__ |= ( pSrc->dualCTSProtection << 7 ); + tmp127__ |= ( pSrc->secondaryBeacon << 8 ); + tmp127__ |= ( pSrc->lsigTXOPProtectionFullSupport << 9 ); + tmp127__ |= ( pSrc->pcoActive << 10 ); + tmp127__ |= ( pSrc->pcoPhase << 11 ); + tmp127__ |= ( pSrc->reserved2 << 12 ); + frameshtons(pCtx, pBuf, tmp127__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -29194,9 +26212,9 @@ tANI_U32 dot11fPackIeMeasurementReport(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp146__; - tANI_U8 tmp147__; - tANI_U8 tmp148__; + tANI_U8 tmp128__; + tANI_U8 tmp129__; + tANI_U8 tmp130__; tANI_U32 status = DOT11F_PARSE_SUCCESS; status = dot11fGetPackedIEMeasurementReport(pCtx, pSrc, &nNeeded); if ( ! DOT11F_SUCCEEDED( status ) ) return status; @@ -29210,12 +26228,12 @@ tANI_U32 dot11fPackIeMeasurementReport(tpAniSirGlobal pCtx, *pBuf = pSrc->token; *pnConsumed += 1; pBuf += 1; - tmp146__ = 0U; - tmp146__ |= ( pSrc->late << 0 ); - tmp146__ |= ( pSrc->incapable << 1 ); - tmp146__ |= ( pSrc->refused << 2 ); - tmp146__ |= ( pSrc->unused << 3 ); - *pBuf = tmp146__; + tmp128__ = 0U; + tmp128__ |= ( pSrc->late << 0 ); + tmp128__ |= ( pSrc->incapable << 1 ); + tmp128__ |= ( pSrc->refused << 2 ); + tmp128__ |= ( pSrc->unused << 3 ); + *pBuf = tmp128__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -29235,14 +26253,14 @@ tANI_U32 dot11fPackIeMeasurementReport(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Basic.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp147__ = 0U; - tmp147__ |= ( pSrc->report.Basic.bss << 0 ); - tmp147__ |= ( pSrc->report.Basic.ofdm_preamble << 1 ); - tmp147__ |= ( pSrc->report.Basic.unid_signal << 2 ); - tmp147__ |= ( pSrc->report.Basic.rader << 3 ); - tmp147__ |= ( pSrc->report.Basic.unmeasured << 4 ); - tmp147__ |= ( pSrc->report.Basic.unused << 5 ); - *pBuf = tmp147__; + tmp129__ = 0U; + tmp129__ |= ( pSrc->report.Basic.bss << 0 ); + tmp129__ |= ( pSrc->report.Basic.ofdm_preamble << 1 ); + tmp129__ |= ( pSrc->report.Basic.unid_signal << 2 ); + tmp129__ |= ( pSrc->report.Basic.rader << 3 ); + tmp129__ |= ( pSrc->report.Basic.unmeasured << 4 ); + tmp129__ |= ( pSrc->report.Basic.unused << 5 ); + *pBuf = tmp129__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -29309,10 +26327,10 @@ tANI_U32 dot11fPackIeMeasurementReport(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Beacon.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp148__ = 0U; - tmp148__ |= ( pSrc->report.Beacon.condensed_PHY << 0 ); - tmp148__ |= ( pSrc->report.Beacon.reported_frame_type << 7 ); - *pBuf = tmp148__; + tmp130__ = 0U; + tmp130__ |= ( pSrc->report.Beacon.condensed_PHY << 0 ); + tmp130__ |= ( pSrc->report.Beacon.reported_frame_type << 7 ); + *pBuf = tmp130__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -29361,7 +26379,7 @@ tANI_U32 dot11fPackIeMeasurementRequest(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp149__; + tANI_U8 tmp131__; tANI_U32 status = DOT11F_PARSE_SUCCESS; status = dot11fGetPackedIEMeasurementRequest(pCtx, pSrc, &nNeeded); if ( ! DOT11F_SUCCEEDED( status ) ) return status; @@ -29375,14 +26393,14 @@ tANI_U32 dot11fPackIeMeasurementRequest(tpAniSirGlobal pCtx, *pBuf = pSrc->measurement_token; *pnConsumed += 1; pBuf += 1; - tmp149__ = 0U; - tmp149__ |= ( pSrc->parallel << 0 ); - tmp149__ |= ( pSrc->enable << 1 ); - tmp149__ |= ( pSrc->request << 2 ); - tmp149__ |= ( pSrc->report << 3 ); - tmp149__ |= ( pSrc->durationMandatory << 4 ); - tmp149__ |= ( pSrc->unused << 5 ); - *pBuf = tmp149__; + tmp131__ = 0U; + tmp131__ |= ( pSrc->parallel << 0 ); + tmp131__ |= ( pSrc->enable << 1 ); + tmp131__ |= ( pSrc->request << 2 ); + tmp131__ |= ( pSrc->report << 3 ); + tmp131__ |= ( pSrc->durationMandatory << 4 ); + tmp131__ |= ( pSrc->unused << 5 ); + *pBuf = tmp131__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -29471,7 +26489,7 @@ tANI_U32 dot11fPackIeMobilityDomain(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp150__; + tANI_U8 tmp132__; nNeeded += 3; while ( pSrc->present ) { @@ -29483,11 +26501,11 @@ tANI_U32 dot11fPackIeMobilityDomain(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->MDID, 0); *pnConsumed += 2; pBuf += 2; - tmp150__ = 0U; - tmp150__ |= ( pSrc->overDSCap << 0 ); - tmp150__ |= ( pSrc->resourceReqCap << 1 ); - tmp150__ |= ( pSrc->reserved << 2 ); - *pBuf = tmp150__; + tmp132__ = 0U; + tmp132__ |= ( pSrc->overDSCap << 0 ); + tmp132__ |= ( pSrc->resourceReqCap << 1 ); + tmp132__ |= ( pSrc->reserved << 2 ); + *pBuf = tmp132__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -29510,8 +26528,8 @@ tANI_U32 dot11fPackIeNeighborReport(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp151__; - tANI_U8 tmp152__; + tANI_U8 tmp133__; + tANI_U8 tmp134__; tANI_U32 status = DOT11F_PARSE_SUCCESS; status = dot11fGetPackedIENeighborReport(pCtx, pSrc, &nNeeded); if ( ! DOT11F_SUCCEEDED( status ) ) return status; @@ -29525,24 +26543,24 @@ tANI_U32 dot11fPackIeNeighborReport(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); *pnConsumed += 6; pBuf += 6; - tmp151__ = 0U; - tmp151__ |= ( pSrc->APReachability << 0 ); - tmp151__ |= ( pSrc->Security << 2 ); - tmp151__ |= ( pSrc->KeyScope << 3 ); - tmp151__ |= ( pSrc->SpecMgmtCap << 4 ); - tmp151__ |= ( pSrc->QosCap << 5 ); - tmp151__ |= ( pSrc->apsd << 6 ); - tmp151__ |= ( pSrc->rrm << 7 ); - *pBuf = tmp151__; + tmp133__ = 0U; + tmp133__ |= ( pSrc->APReachability << 0 ); + tmp133__ |= ( pSrc->Security << 2 ); + tmp133__ |= ( pSrc->KeyScope << 3 ); + tmp133__ |= ( pSrc->SpecMgmtCap << 4 ); + tmp133__ |= ( pSrc->QosCap << 5 ); + tmp133__ |= ( pSrc->apsd << 6 ); + tmp133__ |= ( pSrc->rrm << 7 ); + *pBuf = tmp133__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp152__ = 0U; - tmp152__ |= ( pSrc->DelayedBA << 0 ); - tmp152__ |= ( pSrc->ImmBA << 1 ); - tmp152__ |= ( pSrc->MobilityDomain << 2 ); - tmp152__ |= ( pSrc->reserved << 3 ); - *pBuf = tmp152__; + tmp134__ = 0U; + tmp134__ |= ( pSrc->DelayedBA << 0 ); + tmp134__ |= ( pSrc->ImmBA << 1 ); + tmp134__ |= ( pSrc->MobilityDomain << 2 ); + tmp134__ |= ( pSrc->reserved << 3 ); + *pBuf = tmp134__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -29632,7 +26650,7 @@ tANI_U32 dot11fPackIeOperatingMode(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp153__; + tANI_U8 tmp135__; nNeeded += 1; while ( pSrc->present ) { @@ -29641,12 +26659,12 @@ tANI_U32 dot11fPackIeOperatingMode(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp153__ = 0U; - tmp153__ |= ( pSrc->chanWidth << 0 ); - tmp153__ |= ( pSrc->reserved << 2 ); - tmp153__ |= ( pSrc->rxNSS << 4 ); - tmp153__ |= ( pSrc->rxNSSType << 7 ); - *pBuf = tmp153__; + tmp135__ = 0U; + tmp135__ |= ( pSrc->chanWidth << 0 ); + tmp135__ |= ( pSrc->reserved << 2 ); + tmp135__ |= ( pSrc->rxNSS << 4 ); + tmp135__ |= ( pSrc->rxNSSType << 7 ); + *pBuf = tmp135__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -30600,7 +27618,7 @@ tANI_U32 dot11fPackIePUBufferStatus(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp154__; + tANI_U8 tmp136__; nNeeded += 1; while ( pSrc->present ) { @@ -30609,13 +27627,13 @@ tANI_U32 dot11fPackIePUBufferStatus(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp154__ = 0U; - tmp154__ |= ( pSrc->ac_bk_traffic_aval << 0 ); - tmp154__ |= ( pSrc->ac_be_traffic_aval << 1 ); - tmp154__ |= ( pSrc->ac_vi_traffic_aval << 2 ); - tmp154__ |= ( pSrc->ac_vo_traffic_aval << 3 ); - tmp154__ |= ( pSrc->reserved << 4 ); - *pBuf = tmp154__; + tmp136__ = 0U; + tmp136__ |= ( pSrc->ac_bk_traffic_aval << 0 ); + tmp136__ |= ( pSrc->ac_be_traffic_aval << 1 ); + tmp136__ |= ( pSrc->ac_vi_traffic_aval << 2 ); + tmp136__ |= ( pSrc->ac_vo_traffic_aval << 3 ); + tmp136__ |= ( pSrc->reserved << 4 ); + *pBuf = tmp136__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -30737,7 +27755,7 @@ tANI_U32 dot11fPackIeQOSCapsAp(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp155__; + tANI_U8 tmp137__; nNeeded += 1; while ( pSrc->present ) { @@ -30746,13 +27764,13 @@ tANI_U32 dot11fPackIeQOSCapsAp(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp155__ = 0U; - tmp155__ |= ( pSrc->count << 0 ); - tmp155__ |= ( pSrc->qack << 4 ); - tmp155__ |= ( pSrc->qreq << 5 ); - tmp155__ |= ( pSrc->txopreq << 6 ); - tmp155__ |= ( pSrc->reserved << 7 ); - *pBuf = tmp155__; + tmp137__ = 0U; + tmp137__ |= ( pSrc->count << 0 ); + tmp137__ |= ( pSrc->qack << 4 ); + tmp137__ |= ( pSrc->qreq << 5 ); + tmp137__ |= ( pSrc->txopreq << 6 ); + tmp137__ |= ( pSrc->reserved << 7 ); + *pBuf = tmp137__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -30775,7 +27793,7 @@ tANI_U32 dot11fPackIeQOSCapsStation(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp156__; + tANI_U8 tmp138__; nNeeded += 1; while ( pSrc->present ) { @@ -30784,15 +27802,15 @@ tANI_U32 dot11fPackIeQOSCapsStation(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp156__ = 0U; - tmp156__ |= ( pSrc->acvo_uapsd << 0 ); - tmp156__ |= ( pSrc->acvi_uapsd << 1 ); - tmp156__ |= ( pSrc->acbk_uapsd << 2 ); - tmp156__ |= ( pSrc->acbe_uapsd << 3 ); - tmp156__ |= ( pSrc->qack << 4 ); - tmp156__ |= ( pSrc->max_sp_length << 5 ); - tmp156__ |= ( pSrc->more_data_ack << 7 ); - *pBuf = tmp156__; + tmp138__ = 0U; + tmp138__ |= ( pSrc->acvo_uapsd << 0 ); + tmp138__ |= ( pSrc->acvi_uapsd << 1 ); + tmp138__ |= ( pSrc->acbk_uapsd << 2 ); + tmp138__ |= ( pSrc->acbe_uapsd << 3 ); + tmp138__ |= ( pSrc->qack << 4 ); + tmp138__ |= ( pSrc->max_sp_length << 5 ); + tmp138__ |= ( pSrc->more_data_ack << 7 ); + *pBuf = tmp138__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -31296,9 +28314,9 @@ tANI_U32 dot11fPackIeVHTCaps(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U32 tmp157__; - tANI_U16 tmp158__; - tANI_U16 tmp159__; + tANI_U32 tmp139__; + tANI_U16 tmp140__; + tANI_U16 tmp141__; nNeeded += 12; while ( pSrc->present ) { @@ -31307,48 +28325,48 @@ tANI_U32 dot11fPackIeVHTCaps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp157__ = 0U; - tmp157__ |= ( pSrc->maxMPDULen << 0 ); - tmp157__ |= ( pSrc->supportedChannelWidthSet << 2 ); - tmp157__ |= ( pSrc->ldpcCodingCap << 4 ); - tmp157__ |= ( pSrc->shortGI80MHz << 5 ); - tmp157__ |= ( pSrc->shortGI160and80plus80MHz << 6 ); - tmp157__ |= ( pSrc->txSTBC << 7 ); - tmp157__ |= ( pSrc->rxSTBC << 8 ); - tmp157__ |= ( pSrc->suBeamFormerCap << 11 ); - tmp157__ |= ( pSrc->suBeamformeeCap << 12 ); - tmp157__ |= ( pSrc->csnofBeamformerAntSup << 13 ); - tmp157__ |= ( pSrc->numSoundingDim << 16 ); - tmp157__ |= ( pSrc->muBeamformerCap << 19 ); - tmp157__ |= ( pSrc->muBeamformeeCap << 20 ); - tmp157__ |= ( pSrc->vhtTXOPPS << 21 ); - tmp157__ |= ( pSrc->htcVHTCap << 22 ); - tmp157__ |= ( pSrc->maxAMPDULenExp << 23 ); - tmp157__ |= ( pSrc->vhtLinkAdaptCap << 26 ); - tmp157__ |= ( pSrc->rxAntPattern << 28 ); - tmp157__ |= ( pSrc->txAntPattern << 29 ); - tmp157__ |= ( pSrc->reserved1 << 30 ); - frameshtonl(pCtx, pBuf, tmp157__, 0); + tmp139__ = 0U; + tmp139__ |= ( pSrc->maxMPDULen << 0 ); + tmp139__ |= ( pSrc->supportedChannelWidthSet << 2 ); + tmp139__ |= ( pSrc->ldpcCodingCap << 4 ); + tmp139__ |= ( pSrc->shortGI80MHz << 5 ); + tmp139__ |= ( pSrc->shortGI160and80plus80MHz << 6 ); + tmp139__ |= ( pSrc->txSTBC << 7 ); + tmp139__ |= ( pSrc->rxSTBC << 8 ); + tmp139__ |= ( pSrc->suBeamFormerCap << 11 ); + tmp139__ |= ( pSrc->suBeamformeeCap << 12 ); + tmp139__ |= ( pSrc->csnofBeamformerAntSup << 13 ); + tmp139__ |= ( pSrc->numSoundingDim << 16 ); + tmp139__ |= ( pSrc->muBeamformerCap << 19 ); + tmp139__ |= ( pSrc->muBeamformeeCap << 20 ); + tmp139__ |= ( pSrc->vhtTXOPPS << 21 ); + tmp139__ |= ( pSrc->htcVHTCap << 22 ); + tmp139__ |= ( pSrc->maxAMPDULenExp << 23 ); + tmp139__ |= ( pSrc->vhtLinkAdaptCap << 26 ); + tmp139__ |= ( pSrc->rxAntPattern << 28 ); + tmp139__ |= ( pSrc->txAntPattern << 29 ); + tmp139__ |= ( pSrc->reserved1 << 30 ); + frameshtonl(pCtx, pBuf, tmp139__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; frameshtons(pCtx, pBuf, pSrc->rxMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp158__ = 0U; - tmp158__ |= ( pSrc->rxHighSupDataRate << 0 ); - tmp158__ |= ( pSrc->reserved2 << 13 ); - frameshtons(pCtx, pBuf, tmp158__, 0); + tmp140__ = 0U; + tmp140__ |= ( pSrc->rxHighSupDataRate << 0 ); + tmp140__ |= ( pSrc->reserved2 << 13 ); + frameshtons(pCtx, pBuf, tmp140__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; frameshtons(pCtx, pBuf, pSrc->txMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp159__ = 0U; - tmp159__ |= ( pSrc->txSupDataRate << 0 ); - tmp159__ |= ( pSrc->reserved3 << 13 ); - frameshtons(pCtx, pBuf, tmp159__, 0); + tmp141__ = 0U; + tmp141__ |= ( pSrc->txSupDataRate << 0 ); + tmp141__ |= ( pSrc->reserved3 << 13 ); + frameshtons(pCtx, pBuf, tmp141__, 0); *pnConsumed += 2; // fieldsEndFlag = 1 nBuf -= 2 ; @@ -31551,7 +28569,7 @@ tANI_U32 dot11fPackIeWAPI(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U16 tmp160__; + tANI_U16 tmp142__; tANI_U32 status = DOT11F_PARSE_SUCCESS; status = dot11fGetPackedIEWAPI(pCtx, pSrc, &nNeeded); if ( ! DOT11F_SUCCEEDED( status ) ) return status; @@ -31580,10 +28598,10 @@ tANI_U32 dot11fPackIeWAPI(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->multicast_cipher_suite, 4); *pnConsumed += 4; pBuf += 4; - tmp160__ = 0U; - tmp160__ |= ( pSrc->preauth << 0 ); - tmp160__ |= ( pSrc->reserved << 1 ); - frameshtons(pCtx, pBuf, tmp160__, 0); + tmp142__ = 0U; + tmp142__ |= ( pSrc->preauth << 0 ); + tmp142__ |= ( pSrc->reserved << 1 ); + frameshtons(pCtx, pBuf, tmp142__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -31726,7 +28744,7 @@ tANI_U32 dot11fPackIeWMMCaps(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp161__; + tANI_U8 tmp143__; nNeeded += 2; while ( pSrc->present ) { @@ -31748,13 +28766,13 @@ tANI_U32 dot11fPackIeWMMCaps(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp161__ = 0U; - tmp161__ |= ( pSrc->reserved << 0 ); - tmp161__ |= ( pSrc->qack << 4 ); - tmp161__ |= ( pSrc->queue_request << 5 ); - tmp161__ |= ( pSrc->txop_request << 6 ); - tmp161__ |= ( pSrc->more_ack << 7 ); - *pBuf = tmp161__; + tmp143__ = 0U; + tmp143__ |= ( pSrc->reserved << 0 ); + tmp143__ |= ( pSrc->qack << 4 ); + tmp143__ |= ( pSrc->queue_request << 5 ); + tmp143__ |= ( pSrc->txop_request << 6 ); + tmp143__ |= ( pSrc->more_ack << 7 ); + *pBuf = tmp143__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -31777,7 +28795,7 @@ tANI_U32 dot11fPackIeWMMInfoAp(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp162__; + tANI_U8 tmp144__; nNeeded += 2; while ( pSrc->present ) { @@ -31799,11 +28817,11 @@ tANI_U32 dot11fPackIeWMMInfoAp(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp162__ = 0U; - tmp162__ |= ( pSrc->param_set_count << 0 ); - tmp162__ |= ( pSrc->reserved << 4 ); - tmp162__ |= ( pSrc->uapsd << 7 ); - *pBuf = tmp162__; + tmp144__ = 0U; + tmp144__ |= ( pSrc->param_set_count << 0 ); + tmp144__ |= ( pSrc->reserved << 4 ); + tmp144__ |= ( pSrc->uapsd << 7 ); + *pBuf = tmp144__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -31826,7 +28844,7 @@ tANI_U32 dot11fPackIeWMMInfoStation(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp163__; + tANI_U8 tmp145__; nNeeded += 2; while ( pSrc->present ) { @@ -31848,15 +28866,15 @@ tANI_U32 dot11fPackIeWMMInfoStation(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp163__ = 0U; - tmp163__ |= ( pSrc->acvo_uapsd << 0 ); - tmp163__ |= ( pSrc->acvi_uapsd << 1 ); - tmp163__ |= ( pSrc->acbk_uapsd << 2 ); - tmp163__ |= ( pSrc->acbe_uapsd << 3 ); - tmp163__ |= ( pSrc->reserved1 << 4 ); - tmp163__ |= ( pSrc->max_sp_length << 5 ); - tmp163__ |= ( pSrc->reserved2 << 7 ); - *pBuf = tmp163__; + tmp145__ = 0U; + tmp145__ |= ( pSrc->acvo_uapsd << 0 ); + tmp145__ |= ( pSrc->acvi_uapsd << 1 ); + tmp145__ |= ( pSrc->acbk_uapsd << 2 ); + tmp145__ |= ( pSrc->acbe_uapsd << 3 ); + tmp145__ |= ( pSrc->reserved1 << 4 ); + tmp145__ |= ( pSrc->max_sp_length << 5 ); + tmp145__ |= ( pSrc->reserved2 << 7 ); + *pBuf = tmp145__; *pnConsumed += 1; // fieldsEndFlag = 1 nBuf -= 1 ; @@ -31879,14 +28897,14 @@ tANI_U32 dot11fPackIeWMMParams(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp164__; - tANI_U8 tmp165__; - tANI_U8 tmp166__; - tANI_U8 tmp167__; - tANI_U8 tmp168__; - tANI_U8 tmp169__; - tANI_U8 tmp170__; - tANI_U8 tmp171__; + tANI_U8 tmp146__; + tANI_U8 tmp147__; + tANI_U8 tmp148__; + tANI_U8 tmp149__; + tANI_U8 tmp150__; + tANI_U8 tmp151__; + tANI_U8 tmp152__; + tANI_U8 tmp153__; nNeeded += 19; while ( pSrc->present ) { @@ -31914,76 +28932,76 @@ tANI_U32 dot11fPackIeWMMParams(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved2; *pnConsumed += 1; pBuf += 1; - tmp164__ = 0U; - tmp164__ |= ( pSrc->acbe_aifsn << 0 ); - tmp164__ |= ( pSrc->acbe_acm << 4 ); - tmp164__ |= ( pSrc->acbe_aci << 5 ); - tmp164__ |= ( pSrc->unused1 << 7 ); - *pBuf = tmp164__; + tmp146__ = 0U; + tmp146__ |= ( pSrc->acbe_aifsn << 0 ); + tmp146__ |= ( pSrc->acbe_acm << 4 ); + tmp146__ |= ( pSrc->acbe_aci << 5 ); + tmp146__ |= ( pSrc->unused1 << 7 ); + *pBuf = tmp146__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp165__ = 0U; - tmp165__ |= ( pSrc->acbe_acwmin << 0 ); - tmp165__ |= ( pSrc->acbe_acwmax << 4 ); - *pBuf = tmp165__; + tmp147__ = 0U; + tmp147__ |= ( pSrc->acbe_acwmin << 0 ); + tmp147__ |= ( pSrc->acbe_acwmax << 4 ); + *pBuf = tmp147__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp166__ = 0U; - tmp166__ |= ( pSrc->acbk_aifsn << 0 ); - tmp166__ |= ( pSrc->acbk_acm << 4 ); - tmp166__ |= ( pSrc->acbk_aci << 5 ); - tmp166__ |= ( pSrc->unused2 << 7 ); - *pBuf = tmp166__; + tmp148__ = 0U; + tmp148__ |= ( pSrc->acbk_aifsn << 0 ); + tmp148__ |= ( pSrc->acbk_acm << 4 ); + tmp148__ |= ( pSrc->acbk_aci << 5 ); + tmp148__ |= ( pSrc->unused2 << 7 ); + *pBuf = tmp148__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp167__ = 0U; - tmp167__ |= ( pSrc->acbk_acwmin << 0 ); - tmp167__ |= ( pSrc->acbk_acwmax << 4 ); - *pBuf = tmp167__; + tmp149__ = 0U; + tmp149__ |= ( pSrc->acbk_acwmin << 0 ); + tmp149__ |= ( pSrc->acbk_acwmax << 4 ); + *pBuf = tmp149__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp168__ = 0U; - tmp168__ |= ( pSrc->acvi_aifsn << 0 ); - tmp168__ |= ( pSrc->acvi_acm << 4 ); - tmp168__ |= ( pSrc->acvi_aci << 5 ); - tmp168__ |= ( pSrc->unused3 << 7 ); - *pBuf = tmp168__; + tmp150__ = 0U; + tmp150__ |= ( pSrc->acvi_aifsn << 0 ); + tmp150__ |= ( pSrc->acvi_acm << 4 ); + tmp150__ |= ( pSrc->acvi_aci << 5 ); + tmp150__ |= ( pSrc->unused3 << 7 ); + *pBuf = tmp150__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp169__ = 0U; - tmp169__ |= ( pSrc->acvi_acwmin << 0 ); - tmp169__ |= ( pSrc->acvi_acwmax << 4 ); - *pBuf = tmp169__; + tmp151__ = 0U; + tmp151__ |= ( pSrc->acvi_acwmin << 0 ); + tmp151__ |= ( pSrc->acvi_acwmax << 4 ); + *pBuf = tmp151__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp170__ = 0U; - tmp170__ |= ( pSrc->acvo_aifsn << 0 ); - tmp170__ |= ( pSrc->acvo_acm << 4 ); - tmp170__ |= ( pSrc->acvo_aci << 5 ); - tmp170__ |= ( pSrc->unused4 << 7 ); - *pBuf = tmp170__; + tmp152__ = 0U; + tmp152__ |= ( pSrc->acvo_aifsn << 0 ); + tmp152__ |= ( pSrc->acvo_acm << 4 ); + tmp152__ |= ( pSrc->acvo_aci << 5 ); + tmp152__ |= ( pSrc->unused4 << 7 ); + *pBuf = tmp152__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp171__ = 0U; - tmp171__ |= ( pSrc->acvo_acwmin << 0 ); - tmp171__ |= ( pSrc->acvo_acwmax << 4 ); - *pBuf = tmp171__; + tmp153__ = 0U; + tmp153__ |= ( pSrc->acvo_acwmin << 0 ); + tmp153__ |= ( pSrc->acvo_acwmax << 4 ); + *pBuf = tmp153__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -33307,217 +30325,6 @@ tANI_U32 dot11fPackAssocRequest(tpAniSirGlobal pCtx, tDot11fAssocRequest *pFrm, FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("max_sp_length (2): %d\n"), pFrm->WMMInfoStation.max_sp_length); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved2 (1): %d\n"), pFrm->WMMInfoStation.reserved2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("WscIEOpaque:\n")); if (!pFrm->WscIEOpaque.present) { @@ -34456,217 +31263,6 @@ tANI_U32 dot11fPackAssocResponse(tpAniSirGlobal pCtx, tDot11fAssocResponse *pFrm FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->WMMTSPEC[i].medium_time, 2); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("WscAssocRes:\n")); if (!pFrm->WscAssocRes.present) { @@ -35881,217 +32477,6 @@ tANI_U32 dot11fPackBeacon(tpAniSirGlobal pCtx, tDot11fBeacon *pFrm, tANI_U8 *pBu FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("WscBeacon:\n")); if (!pFrm->WscBeacon.present) { @@ -36924,217 +33309,6 @@ tANI_U32 dot11fPackBeacon2(tpAniSirGlobal pCtx, tDot11fBeacon2 *pFrm, tANI_U8 *p FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("txop_request (1): %d\n"), pFrm->WMMCaps.txop_request); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("more_ack (1): %d\n"), pFrm->WMMCaps.more_ack); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("WscBeacon:\n")); if (!pFrm->WscBeacon.present) { @@ -38113,217 +34287,6 @@ tANI_U32 dot11fPackBeaconIEs(tpAniSirGlobal pCtx, tDot11fBeaconIEs *pFrm, tANI_U FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("WscBeaconProbeRes:\n")); if (!pFrm->WscBeaconProbeRes.present) { @@ -41316,217 +37279,6 @@ tANI_U32 dot11fPackProbeResponse(tpAniSirGlobal pCtx, tDot11fProbeResponse *pFrm FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("WscProbeRes:\n")); if (!pFrm->WscProbeRes.present) { @@ -42901,217 +38653,6 @@ tANI_U32 dot11fPackReAssocRequest(tpAniSirGlobal pCtx, tDot11fReAssocRequest *pF FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("max_sp_length (2): %d\n"), pFrm->WMMInfoStation.max_sp_length); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved2 (1): %d\n"), pFrm->WMMInfoStation.reserved2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("WscIEOpaque:\n")); if (!pFrm->WscIEOpaque.present) { @@ -44116,217 +39657,6 @@ tANI_U32 dot11fPackReAssocResponse(tpAniSirGlobal pCtx, tDot11fReAssocResponse * FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_tsrates: %d.\n"), pFrm->ESETrafStrmRateSet.num_tsrates); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->ESETrafStrmRateSet.tsrates, pFrm->ESETrafStrmRateSet.num_tsrates); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Airgo:\n")); - if (!pFrm->Airgo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropSuppRates:\n")); - if (!pFrm->Airgo.PropSuppRates.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_rates: %d.\n"), pFrm->Airgo.PropSuppRates.num_rates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.PropSuppRates.rates, pFrm->Airgo.PropSuppRates.num_rates); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("APName:\n")); - if (!pFrm->Airgo.APName.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_name: %d.\n"), pFrm->Airgo.APName.num_name); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.APName.name, pFrm->Airgo.APName.num_name); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("HCF:\n")); - if (!pFrm->Airgo.HCF.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.HCF.enabled, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("WDS:\n")); - if (!pFrm->Airgo.WDS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_wdsData: %d.\n"), pFrm->Airgo.WDS.num_wdsData); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.WDS.wdsData, pFrm->Airgo.WDS.num_wdsData); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("BPIndicator:\n")); - if (!pFrm->Airgo.BPIndicator.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.indicator, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.BPIndicator.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("LoadInfo:\n")); - if (!pFrm->Airgo.LoadInfo.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.num_stas, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadInfo.channel_util, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("LoadBalance:\n")); - if (!pFrm->Airgo.LoadBalance.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.bssid, 6); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LoadBalance.channel, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropAssocType:\n")); - if (!pFrm->Airgo.PropAssocType.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropAssocType.type, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("LLAttr:\n")); - if (!pFrm->Airgo.LLAttr.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.LLAttr.defer_threshold, 4); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropCapability:\n")); - if (!pFrm->Airgo.PropCapability.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropCapability.capability, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Version:\n")); - if (!pFrm->Airgo.Version.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.chip_rev, 4); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Version.card_type, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_build_version: %d.\n"), pFrm->Airgo.Version.num_build_version); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->Airgo.Version.build_version, pFrm->Airgo.Version.num_build_version); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropEDCAParams:\n")); - if (!pFrm->Airgo.PropEDCAParams.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.qos, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.reserved, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbe_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbe_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbe_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("unused1 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbe_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbe_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbe_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbe_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbk_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbk_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbk_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("unused2 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbk_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acbk_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acbk_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acbk_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvi_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvi_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvi_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("unused3 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused3); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvi_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvi_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvi_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvi_txoplimit, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_aifsn (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aifsn); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_acm (1): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_acm); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_aci (2): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_aci); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("unused4 (1): %d\n"), pFrm->Airgo.PropEDCAParams.unused4); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_min (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_min); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_max (4): %d\n"), pFrm->Airgo.PropEDCAParams.acvo_max); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropEDCAParams.acvo_txoplimit, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Titan:\n")); - if (!pFrm->Airgo.Titan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.concat_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.compression_tcid_bitmap, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.cb_state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Titan.rev_fcs_state, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropChannSwitchAnn:\n")); - if (!pFrm->Airgo.PropChannSwitchAnn.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.mode, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.primary_channel, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.sub_band, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropChannSwitchAnn.channel_switch_count, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("PropQuietBSS:\n")); - if (!pFrm->Airgo.PropQuietBSS.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_count, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_period, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_duration, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.PropQuietBSS.quiet_offset, 2); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("TriggerStaBgScan:\n")); - if (!pFrm->Airgo.TriggerStaBgScan.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.TriggerStaBgScan.enable, 1); - } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Taurus:\n")); - if (!pFrm->Airgo.Taurus.present) - { - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); - } - else - { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baTIDBitmap, 2); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->Airgo.Taurus.baPolicy, 2); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("baBufferSize (12): %d\n"), pFrm->Airgo.Taurus.baBufferSize); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("rsvd (4): %d\n"), pFrm->Airgo.Taurus.rsvd); - } - } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("WscReassocRes:\n")); if (!pFrm->WscReassocRes.present) { @@ -46801,51 +42131,15 @@ static tANI_U32 PackCore(tpAniSirGlobal pCtx, len = 0U; switch ( pIe->sig ) { - case SigIeAPName: - status |= dot11fPackIeAPName(pCtx, ( tDot11fIEAPName* )(pSrc + pIe->offset + sizeof(tDot11fIEAPName) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeBPIndicator: - status |= dot11fPackIeBPIndicator(pCtx, ( tDot11fIEBPIndicator* )(pSrc + pIe->offset + sizeof(tDot11fIEBPIndicator) * i ), pBufRemaining, nBufRemaining, &len); - break; case SigIeCondensedCountryStr: status |= dot11fPackIeCondensedCountryStr(pCtx, ( tDot11fIECondensedCountryStr* )(pSrc + pIe->offset + sizeof(tDot11fIECondensedCountryStr) * i ), pBufRemaining, nBufRemaining, &len); break; case SigIeGTK: status |= dot11fPackIeGTK(pCtx, ( tDot11fIEGTK* )(pSrc + pIe->offset + sizeof(tDot11fIEGTK) * i ), pBufRemaining, nBufRemaining, &len); break; - case SigIeHCF: - status |= dot11fPackIeHCF(pCtx, ( tDot11fIEHCF* )(pSrc + pIe->offset + sizeof(tDot11fIEHCF) * i ), pBufRemaining, nBufRemaining, &len); - break; case SigIeIGTK: status |= dot11fPackIeIGTK(pCtx, ( tDot11fIEIGTK* )(pSrc + pIe->offset + sizeof(tDot11fIEIGTK) * i ), pBufRemaining, nBufRemaining, &len); break; - case SigIeLLAttr: - status |= dot11fPackIeLLAttr(pCtx, ( tDot11fIELLAttr* )(pSrc + pIe->offset + sizeof(tDot11fIELLAttr) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeLoadBalance: - status |= dot11fPackIeLoadBalance(pCtx, ( tDot11fIELoadBalance* )(pSrc + pIe->offset + sizeof(tDot11fIELoadBalance) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeLoadInfo: - status |= dot11fPackIeLoadInfo(pCtx, ( tDot11fIELoadInfo* )(pSrc + pIe->offset + sizeof(tDot11fIELoadInfo) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIePropAssocType: - status |= dot11fPackIePropAssocType(pCtx, ( tDot11fIEPropAssocType* )(pSrc + pIe->offset + sizeof(tDot11fIEPropAssocType) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIePropCapability: - status |= dot11fPackIePropCapability(pCtx, ( tDot11fIEPropCapability* )(pSrc + pIe->offset + sizeof(tDot11fIEPropCapability) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIePropChannSwitchAnn: - status |= dot11fPackIePropChannSwitchAnn(pCtx, ( tDot11fIEPropChannSwitchAnn* )(pSrc + pIe->offset + sizeof(tDot11fIEPropChannSwitchAnn) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIePropEDCAParams: - status |= dot11fPackIePropEDCAParams(pCtx, ( tDot11fIEPropEDCAParams* )(pSrc + pIe->offset + sizeof(tDot11fIEPropEDCAParams) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIePropQuietBSS: - status |= dot11fPackIePropQuietBSS(pCtx, ( tDot11fIEPropQuietBSS* )(pSrc + pIe->offset + sizeof(tDot11fIEPropQuietBSS) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIePropSuppRates: - status |= dot11fPackIePropSuppRates(pCtx, ( tDot11fIEPropSuppRates* )(pSrc + pIe->offset + sizeof(tDot11fIEPropSuppRates) * i ), pBufRemaining, nBufRemaining, &len); - break; case SigIeR0KH_ID: status |= dot11fPackIeR0KH_ID(pCtx, ( tDot11fIER0KH_ID* )(pSrc + pIe->offset + sizeof(tDot11fIER0KH_ID) * i ), pBufRemaining, nBufRemaining, &len); break; @@ -46855,21 +42149,6 @@ static tANI_U32 PackCore(tpAniSirGlobal pCtx, case SigIeTSFInfo: status |= dot11fPackIeTSFInfo(pCtx, ( tDot11fIETSFInfo* )(pSrc + pIe->offset + sizeof(tDot11fIETSFInfo) * i ), pBufRemaining, nBufRemaining, &len); break; - case SigIeTaurus: - status |= dot11fPackIeTaurus(pCtx, ( tDot11fIETaurus* )(pSrc + pIe->offset + sizeof(tDot11fIETaurus) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeTitan: - status |= dot11fPackIeTitan(pCtx, ( tDot11fIETitan* )(pSrc + pIe->offset + sizeof(tDot11fIETitan) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeTriggerStaBgScan: - status |= dot11fPackIeTriggerStaBgScan(pCtx, ( tDot11fIETriggerStaBgScan* )(pSrc + pIe->offset + sizeof(tDot11fIETriggerStaBgScan) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeVersion: - status |= dot11fPackIeVersion(pCtx, ( tDot11fIEVersion* )(pSrc + pIe->offset + sizeof(tDot11fIEVersion) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeWDS: - status |= dot11fPackIeWDS(pCtx, ( tDot11fIEWDS* )(pSrc + pIe->offset + sizeof(tDot11fIEWDS) * i ), pBufRemaining, nBufRemaining, &len); - break; case SigIeAPChannelReport: status |= dot11fPackIeAPChannelReport(pCtx, ( tDot11fIEAPChannelReport* )(pSrc + pIe->offset + sizeof(tDot11fIEAPChannelReport) * i ), pBufRemaining, nBufRemaining, &len); break; @@ -46939,9 +42218,6 @@ static tANI_U32 PackCore(tpAniSirGlobal pCtx, case SigIeAID: status |= dot11fPackIeAID(pCtx, ( tDot11fIEAID* )(pSrc + pIe->offset + sizeof(tDot11fIEAID) * i ), pBufRemaining, nBufRemaining, &len); break; - case SigIeAirgo: - status |= dot11fPackIeAirgo(pCtx, ( tDot11fIEAirgo* )(pSrc + pIe->offset + sizeof(tDot11fIEAirgo) * i ), pBufRemaining, nBufRemaining, &len); - break; case SigIeCFParams: status |= dot11fPackIeCFParams(pCtx, ( tDot11fIECFParams* )(pSrc + pIe->offset + sizeof(tDot11fIECFParams) * i ), pBufRemaining, nBufRemaining, &len); break; diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c index 492ee9c51cda..ddc3e6c90f10 100644 --- a/CORE/SYS/legacy/src/utils/src/parserApi.c +++ b/CORE/SYS/legacy/src/utils/src/parserApi.c @@ -232,45 +232,11 @@ PopulateDot11fCapabilities(tpAniSirGlobal pMac, return nSirStatus; } -#if 0 - if ( sirIsPropCapabilityEnabled( pMac, SIR_MAC_PROP_CAPABILITY_11EQOS ) ) - { - SIR_MAC_CLEAR_CAPABILITY( cfg, QOS ); - } -#endif swapBitField16( cfg, ( tANI_U16* )pDot11f ); return eSIR_SUCCESS; } // End PopulateDot11fCapabilities. -tSirRetStatus -PopulateDot11fCapabilities2(tpAniSirGlobal pMac, - tDot11fFfCapabilities *pDot11f, - tpDphHashNode pSta, - tpPESession psessionEntry) -{ - tANI_U16 cfg; - tSirRetStatus nSirStatus; - nSirStatus = cfgGetCapabilityInfo( pMac, &cfg ,psessionEntry); - if ( eSIR_SUCCESS != nSirStatus ) - { - dot11fLog( pMac, LOGP, FL("Failed to retrieve the Capabilities b" - "itfield from CFG (%d).\n"), nSirStatus ); - return nSirStatus; - } - - if ( ( NULL != pSta ) && pSta->aniPeer && - PROP_CAPABILITY_GET( 11EQOS, pSta->propCapability ) ) - { - SIR_MAC_CLEAR_CAPABILITY( cfg, QOS ); - } - - swapBitField16( cfg, ( tANI_U16* )pDot11f ); - - return eSIR_SUCCESS; - -} // End PopulateDot11fCapabilities2. - void PopulateDot11fChanSwitchAnn(tpAniSirGlobal pMac, tDot11fIEChanSwitchAnn *pDot11f, @@ -284,18 +250,6 @@ PopulateDot11fChanSwitchAnn(tpAniSirGlobal pMac, } // End PopulateDot11fChanSwitchAnn. void -PopulateDot11fExtChanSwitchAnn(tpAniSirGlobal pMac, - tDot11fIEExtChanSwitchAnn *pDot11f, - tpPESession psessionEntry) -{ - //Has to be updated on the cb state basis - pDot11f->secondaryChannelOffset = - psessionEntry->gLimChannelSwitch.secondarySubBand; - - pDot11f->present = 1; -} - -void PopulateDot11fChanSwitchWrapper(tpAniSirGlobal pMac, tDot11fIEChannelSwitchWrapper *pDot11f, tpPESession psessionEntry) @@ -1897,30 +1851,6 @@ tSirRetStatus PopulateDot11fWPAOpaque( tpAniSirGlobal pMac, //////////////////////////////////////////////////////////////////////// tSirRetStatus -sirGetCfgPropCaps(tpAniSirGlobal pMac, tANI_U16 *caps) -{ -#if 0 - tANI_U32 val; - - *caps = 0; - if (wlan_cfgGetInt(pMac, WNI_CFG_PROPRIETARY_ANI_FEATURES_ENABLED, &val) - != eSIR_SUCCESS) - { - limLog(pMac, LOGP, FL("could not retrieve PropFeature enabled flag\n")); - return eSIR_FAILURE; - } - if (wlan_cfgGetInt(pMac, WNI_CFG_PROP_CAPABILITY, &val) != eSIR_SUCCESS) - { - limLog(pMac, LOGP, FL("could not retrieve PROP_CAPABLITY flag\n")); - return eSIR_FAILURE; - } - - *caps = (tANI_U16) val; -#endif - return eSIR_SUCCESS; -} - -tSirRetStatus sirConvertProbeReqFrame2Struct(tpAniSirGlobal pMac, tANI_U8 *pFrame, tANI_U32 nFrame, diff --git a/CORE/WDA/inc/legacy/halMsgApi.h b/CORE/WDA/inc/legacy/halMsgApi.h index 45edc36edc01..39fd277137f1 100644 --- a/CORE/WDA/inc/legacy/halMsgApi.h +++ b/CORE/WDA/inc/legacy/halMsgApi.h @@ -1106,7 +1106,6 @@ typedef tSirRetStatus (*tHalMsgCallback)(tpAniSirGlobal pMac, tANI_U32 mesgId, v typedef struct { tANI_U16 bssIdx; - tANI_BOOLEAN highPerformance; tSirMacEdcaParamRecord acbe; // best effort tSirMacEdcaParamRecord acbk; // background tSirMacEdcaParamRecord acvi; // video diff --git a/CORE/WDA/inc/legacy/halTypes.h b/CORE/WDA/inc/legacy/halTypes.h index ba7c539a1fd6..c0bb0359ec92 100644 --- a/CORE/WDA/inc/legacy/halTypes.h +++ b/CORE/WDA/inc/legacy/halTypes.h @@ -353,10 +353,6 @@ typedef enum /* Moving the miscellaneous defination required by UMAC are moved here from * volansdefs.h */ -/* -------------------------------------------------------------------- - * Support definitions for taurus - * -------------------------------------------------------------------- - */ /* * Volans supports 8 stations in hardware diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h index 1391cd004064..6ee1ea852cb6 100644 --- a/CORE/WDA/inc/wlan_qct_wda.h +++ b/CORE/WDA/inc/wlan_qct_wda.h @@ -579,9 +579,6 @@ tSirRetStatus uMacPostCtrlMsg(void* pSirGlobal, tSirMbMsg* pMb); #define WDA_CCA_CHANGE_MODE SIR_HAL_CCA_CHANGE_MODE #define WDA_TIMER_WRAP_AROUND_STATS_COLLECT_REQ SIR_HAL_TIMER_WRAP_AROUND_STATS_COLLECT_REQ -/* - * New Taurus related messages - */ #define WDA_ADD_STA_REQ SIR_HAL_ADD_STA_REQ #define WDA_ADD_STA_RSP SIR_HAL_ADD_STA_RSP #define WDA_ADD_STA_SELF_RSP SIR_HAL_ADD_STA_SELF_RSP diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h index 08e23c16673f..d878954f38d3 100644 --- a/CORE/WDI/CP/inc/wlan_qct_wdi.h +++ b/CORE/WDI/CP/inc/wlan_qct_wdi.h @@ -95,9 +95,6 @@ when who what, where, why /* Max number of 11g rates -> 6,9,12,18,24,36,48,54*/ #define WDI_NUM_11A_RATES 8 -/* Max number of legacy rates -> 72, 96, 108*/ -#define WDI_NUM_POLARIS_RATES 3 - /* Max supported MCS set*/ #define WDI_MAC_MAX_SUPPORTED_MCS_SET 16 @@ -1436,12 +1433,6 @@ typedef struct /* 11b, 11a and aniLegacyRates are IE rates which gives rate in unit of 500Kbps */ wpt_uint16 llbRates[WDI_NUM_11B_RATES]; wpt_uint16 llaRates[WDI_NUM_11A_RATES]; - wpt_uint16 aLegacyRates[WDI_NUM_POLARIS_RATES]; - - /*Taurus only supports 26 Titan Rates(no ESF/concat Rates will be supported) - First 26 bits are reserved for those Titan rates and - the last 4 bits(bit28-31) for Taurus, 2(bit26-27) bits are reserved.*/ - wpt_uint32 uEnhancedRateBitmap; //Titan and Taurus Rates /* * 0-76 bits used, remaining reserved diff --git a/firmware_bin/WCNSS_cfg.dat b/firmware_bin/WCNSS_cfg.dat Binary files differindex dcc120d1a2f6..a22533264e65 100644 --- a/firmware_bin/WCNSS_cfg.dat +++ b/firmware_bin/WCNSS_cfg.dat diff --git a/wcnss/inc/wlan_hal_msg.h b/wcnss/inc/wlan_hal_msg.h deleted file mode 100644 index cbaecdc48712..000000000000 --- a/wcnss/inc/wlan_hal_msg.h +++ /dev/null @@ -1,7081 +0,0 @@ -/* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/*========================================================================== - * - * @file: wlan_hal_msg.h - * - * @brief: Exports and types for messages sent to HAL from WDI - * - * @author: Kumar Anand - * - * - *=========================================================================*/ - -#ifndef _WLAN_HAL_MSG_H_ -#define _WLAN_HAL_MSG_H_ - -#include "halLegacyPalTypes.h" -#include "halCompiler.h" -#include "wlan_qct_dev_defs.h" -#include "wlan_nv.h" - -/*--------------------------------------------------------------------------- - API VERSIONING INFORMATION - - The RIVA API is versioned as MAJOR.MINOR.VERSION.REVISION - The MAJOR is incremented for major product/architecture changes - (and then MINOR/VERSION/REVISION are zeroed) - The MINOR is incremented for minor product/architecture changes - (and then VERSION/REVISION are zeroed) - The VERSION is incremented if a significant API change occurs - (and then REVISION is zeroed) - The REVISION is incremented if an insignificant API change occurs - or if a new API is added - All values are in the range 0..255 (ie they are 8-bit values) - ---------------------------------------------------------------------------*/ -#define WLAN_HAL_VER_MAJOR 1 -#define WLAN_HAL_VER_MINOR 5 -#define WLAN_HAL_VER_VERSION 1 -#define WLAN_HAL_VER_REVISION 2 - -/*--------------------------------------------------------------------------- - Commom Type definitons - ---------------------------------------------------------------------------*/ - -//This is to force compiler to use the maximum of an int ( 4 bytes ) -#define WLAN_HAL_MAX_ENUM_SIZE 0x7FFFFFFF -#define WLAN_HAL_MSG_TYPE_MAX_ENUM_SIZE 0x7FFF - -//Max no. of transmit categories -#define STACFG_MAX_TC 8 - -//The maximum value of access category -#define WLAN_HAL_MAX_AC 4 - -typedef tANI_U8 tSirMacAddr[6]; -typedef tANI_U8 tHalIpv4Addr[4]; - -#define HAL_MAC_ADDR_LEN 6 -#define HAL_IPV4_ADDR_LEN 4 - -#define WALN_HAL_STA_INVALID_IDX 0xFF -#define WLAN_HAL_BSS_INVALID_IDX 0xFF - -//Default Beacon template size -#define BEACON_TEMPLATE_SIZE 0x180 - - -//Max Tx Data Rate samples -#define MAX_TX_RATE_SAMPLES 10 -//Max Beacon Rssi samples -#define MAX_BCN_RSSI_SAMPLES 10 - -//Param Change Bitmap sent to HAL -#define PARAM_BCN_INTERVAL_CHANGED (1 << 0) -#define PARAM_SHORT_PREAMBLE_CHANGED (1 << 1) -#define PARAM_SHORT_SLOT_TIME_CHANGED (1 << 2) -#define PARAM_llACOEXIST_CHANGED (1 << 3) -#define PARAM_llBCOEXIST_CHANGED (1 << 4) -#define PARAM_llGCOEXIST_CHANGED (1 << 5) -#define PARAM_HT20MHZCOEXIST_CHANGED (1<<6) -#define PARAM_NON_GF_DEVICES_PRESENT_CHANGED (1<<7) -#define PARAM_RIFS_MODE_CHANGED (1<<8) -#define PARAM_LSIG_TXOP_FULL_SUPPORT_CHANGED (1<<9) -#define PARAM_OBSS_MODE_CHANGED (1<<10) -#define PARAM_BEACON_UPDATE_MASK (PARAM_BCN_INTERVAL_CHANGED|PARAM_SHORT_PREAMBLE_CHANGED|PARAM_SHORT_SLOT_TIME_CHANGED|PARAM_llACOEXIST_CHANGED |PARAM_llBCOEXIST_CHANGED|\ - PARAM_llGCOEXIST_CHANGED|PARAM_HT20MHZCOEXIST_CHANGED|PARAM_NON_GF_DEVICES_PRESENT_CHANGED|PARAM_RIFS_MODE_CHANGED|PARAM_LSIG_TXOP_FULL_SUPPORT_CHANGED| PARAM_OBSS_MODE_CHANGED) - -/*Dump command response Buffer size*/ -#define DUMPCMD_RSP_BUFFER 500 - -/*Version string max length (including NUL) */ -#define WLAN_HAL_VERSION_LENGTH 64 - -#define WLAN_HAL_ROAM_SCAN_MAX_PROBE_SIZE 450 -#define WLAN_HAL_ROAM_SCAN_MAX_CHANNELS NUM_RF_CHANNELS -#define WLAN_HAL_ROAM_SCAN_RESERVED_BYTES 56 - -/* Message types for messages exchanged between WDI and HAL */ -typedef enum -{ - //Init/De-Init - WLAN_HAL_START_REQ = 0, - WLAN_HAL_START_RSP = 1, - WLAN_HAL_STOP_REQ = 2, - WLAN_HAL_STOP_RSP = 3, - - //Scan - WLAN_HAL_INIT_SCAN_REQ = 4, - WLAN_HAL_INIT_SCAN_RSP = 5, - WLAN_HAL_START_SCAN_REQ = 6, - WLAN_HAL_START_SCAN_RSP = 7 , - WLAN_HAL_END_SCAN_REQ = 8, - WLAN_HAL_END_SCAN_RSP = 9, - WLAN_HAL_FINISH_SCAN_REQ = 10, - WLAN_HAL_FINISH_SCAN_RSP = 11, - - // HW STA configuration/deconfiguration - WLAN_HAL_CONFIG_STA_REQ = 12, - WLAN_HAL_CONFIG_STA_RSP = 13, - WLAN_HAL_DELETE_STA_REQ = 14, - WLAN_HAL_DELETE_STA_RSP = 15, - WLAN_HAL_CONFIG_BSS_REQ = 16, - WLAN_HAL_CONFIG_BSS_RSP = 17, - WLAN_HAL_DELETE_BSS_REQ = 18, - WLAN_HAL_DELETE_BSS_RSP = 19, - - //Infra STA asscoiation - WLAN_HAL_JOIN_REQ = 20, - WLAN_HAL_JOIN_RSP = 21, - WLAN_HAL_POST_ASSOC_REQ = 22, - WLAN_HAL_POST_ASSOC_RSP = 23, - - //Security - WLAN_HAL_SET_BSSKEY_REQ = 24, - WLAN_HAL_SET_BSSKEY_RSP = 25, - WLAN_HAL_SET_STAKEY_REQ = 26, - WLAN_HAL_SET_STAKEY_RSP = 27, - WLAN_HAL_RMV_BSSKEY_REQ = 28, - WLAN_HAL_RMV_BSSKEY_RSP = 29, - WLAN_HAL_RMV_STAKEY_REQ = 30, - WLAN_HAL_RMV_STAKEY_RSP = 31, - - //Qos Related - WLAN_HAL_ADD_TS_REQ = 32, - WLAN_HAL_ADD_TS_RSP = 33, - WLAN_HAL_DEL_TS_REQ = 34, - WLAN_HAL_DEL_TS_RSP = 35, - WLAN_HAL_UPD_EDCA_PARAMS_REQ = 36, - WLAN_HAL_UPD_EDCA_PARAMS_RSP = 37, - WLAN_HAL_ADD_BA_REQ = 38, - WLAN_HAL_ADD_BA_RSP = 39, - WLAN_HAL_DEL_BA_REQ = 40, - WLAN_HAL_DEL_BA_RSP = 41, - - WLAN_HAL_CH_SWITCH_REQ = 42, - WLAN_HAL_CH_SWITCH_RSP = 43, - WLAN_HAL_SET_LINK_ST_REQ = 44, - WLAN_HAL_SET_LINK_ST_RSP = 45, - WLAN_HAL_GET_STATS_REQ = 46, - WLAN_HAL_GET_STATS_RSP = 47, - WLAN_HAL_UPDATE_CFG_REQ = 48, - WLAN_HAL_UPDATE_CFG_RSP = 49, - - WLAN_HAL_MISSED_BEACON_IND = 50, - WLAN_HAL_UNKNOWN_ADDR2_FRAME_RX_IND = 51, - WLAN_HAL_MIC_FAILURE_IND = 52, - WLAN_HAL_FATAL_ERROR_IND = 53, - WLAN_HAL_SET_KEYDONE_MSG = 54, - - //NV Interface - WLAN_HAL_DOWNLOAD_NV_REQ = 55, - WLAN_HAL_DOWNLOAD_NV_RSP = 56, - - WLAN_HAL_ADD_BA_SESSION_REQ = 57, - WLAN_HAL_ADD_BA_SESSION_RSP = 58, - WLAN_HAL_TRIGGER_BA_REQ = 59, - WLAN_HAL_TRIGGER_BA_RSP = 60, - WLAN_HAL_UPDATE_BEACON_REQ = 61, - WLAN_HAL_UPDATE_BEACON_RSP = 62, - WLAN_HAL_SEND_BEACON_REQ = 63, - WLAN_HAL_SEND_BEACON_RSP = 64, - - WLAN_HAL_SET_BCASTKEY_REQ = 65, - WLAN_HAL_SET_BCASTKEY_RSP = 66, - WLAN_HAL_DELETE_STA_CONTEXT_IND = 67, - WLAN_HAL_UPDATE_PROBE_RSP_TEMPLATE_REQ = 68, - WLAN_HAL_UPDATE_PROBE_RSP_TEMPLATE_RSP = 69, - - // PTT interface support - WLAN_HAL_PROCESS_PTT_REQ = 70, - WLAN_HAL_PROCESS_PTT_RSP = 71, - - // BTAMP related events - WLAN_HAL_SIGNAL_BTAMP_EVENT_REQ = 72, - WLAN_HAL_SIGNAL_BTAMP_EVENT_RSP = 73, - WLAN_HAL_TL_HAL_FLUSH_AC_REQ = 74, - WLAN_HAL_TL_HAL_FLUSH_AC_RSP = 75, - - WLAN_HAL_ENTER_IMPS_REQ = 76, - WLAN_HAL_EXIT_IMPS_REQ = 77, - WLAN_HAL_ENTER_BMPS_REQ = 78, - WLAN_HAL_EXIT_BMPS_REQ = 79, - WLAN_HAL_ENTER_UAPSD_REQ = 80, - WLAN_HAL_EXIT_UAPSD_REQ = 81, - WLAN_HAL_UPDATE_UAPSD_PARAM_REQ = 82, - WLAN_HAL_CONFIGURE_RXP_FILTER_REQ = 83, - WLAN_HAL_ADD_BCN_FILTER_REQ = 84, - WLAN_HAL_REM_BCN_FILTER_REQ = 85, - WLAN_HAL_ADD_WOWL_BCAST_PTRN = 86, - WLAN_HAL_DEL_WOWL_BCAST_PTRN = 87, - WLAN_HAL_ENTER_WOWL_REQ = 88, - WLAN_HAL_EXIT_WOWL_REQ = 89, - WLAN_HAL_HOST_OFFLOAD_REQ = 90, - WLAN_HAL_SET_RSSI_THRESH_REQ = 91, - WLAN_HAL_GET_RSSI_REQ = 92, - WLAN_HAL_SET_UAPSD_AC_PARAMS_REQ = 93, - WLAN_HAL_CONFIGURE_APPS_CPU_WAKEUP_STATE_REQ = 94, - - WLAN_HAL_ENTER_IMPS_RSP = 95, - WLAN_HAL_EXIT_IMPS_RSP = 96, - WLAN_HAL_ENTER_BMPS_RSP = 97, - WLAN_HAL_EXIT_BMPS_RSP = 98, - WLAN_HAL_ENTER_UAPSD_RSP = 99, - WLAN_HAL_EXIT_UAPSD_RSP = 100, - WLAN_HAL_SET_UAPSD_AC_PARAMS_RSP = 101, - WLAN_HAL_UPDATE_UAPSD_PARAM_RSP = 102, - WLAN_HAL_CONFIGURE_RXP_FILTER_RSP = 103, - WLAN_HAL_ADD_BCN_FILTER_RSP = 104, - WLAN_HAL_REM_BCN_FILTER_RSP = 105, - WLAN_HAL_SET_RSSI_THRESH_RSP = 106, - WLAN_HAL_HOST_OFFLOAD_RSP = 107, - WLAN_HAL_ADD_WOWL_BCAST_PTRN_RSP = 108, - WLAN_HAL_DEL_WOWL_BCAST_PTRN_RSP = 109, - WLAN_HAL_ENTER_WOWL_RSP = 110, - WLAN_HAL_EXIT_WOWL_RSP = 111, - WLAN_HAL_RSSI_NOTIFICATION_IND = 112, - WLAN_HAL_GET_RSSI_RSP = 113, - WLAN_HAL_CONFIGURE_APPS_CPU_WAKEUP_STATE_RSP = 114, - - //11k related events - WLAN_HAL_SET_MAX_TX_POWER_REQ = 115, - WLAN_HAL_SET_MAX_TX_POWER_RSP = 116, - - //11R related msgs - WLAN_HAL_AGGR_ADD_TS_REQ = 117, - WLAN_HAL_AGGR_ADD_TS_RSP = 118, - - //P2P WLAN_FEATURE_P2P - WLAN_HAL_SET_P2P_GONOA_REQ = 119, - WLAN_HAL_SET_P2P_GONOA_RSP = 120, - - //WLAN Dump commands - WLAN_HAL_DUMP_COMMAND_REQ = 121, - WLAN_HAL_DUMP_COMMAND_RSP = 122, - - //OEM_DATA FEATURE SUPPORT - WLAN_HAL_START_OEM_DATA_REQ = 123, - WLAN_HAL_START_OEM_DATA_RSP = 124, - - //ADD SELF STA REQ and RSP - WLAN_HAL_ADD_STA_SELF_REQ = 125, - WLAN_HAL_ADD_STA_SELF_RSP = 126, - - //DEL SELF STA SUPPORT - WLAN_HAL_DEL_STA_SELF_REQ = 127, - WLAN_HAL_DEL_STA_SELF_RSP = 128, - - // Coex Indication - WLAN_HAL_COEX_IND = 129, - - // Tx Complete Indication - WLAN_HAL_OTA_TX_COMPL_IND = 130, - - //Host Suspend/resume messages - WLAN_HAL_HOST_SUSPEND_IND = 131, - WLAN_HAL_HOST_RESUME_REQ = 132, - WLAN_HAL_HOST_RESUME_RSP = 133, - - WLAN_HAL_SET_TX_POWER_REQ = 134, - WLAN_HAL_SET_TX_POWER_RSP = 135, - WLAN_HAL_GET_TX_POWER_REQ = 136, - WLAN_HAL_GET_TX_POWER_RSP = 137, - - WLAN_HAL_P2P_NOA_ATTR_IND = 138, - - WLAN_HAL_ENABLE_RADAR_DETECT_REQ = 139, - WLAN_HAL_ENABLE_RADAR_DETECT_RSP = 140, - WLAN_HAL_GET_TPC_REPORT_REQ = 141, - WLAN_HAL_GET_TPC_REPORT_RSP = 142, - WLAN_HAL_RADAR_DETECT_IND = 143, - WLAN_HAL_RADAR_DETECT_INTR_IND = 144, - WLAN_HAL_KEEP_ALIVE_REQ = 145, - WLAN_HAL_KEEP_ALIVE_RSP = 146, - - /*PNO messages*/ - WLAN_HAL_SET_PREF_NETWORK_REQ = 147, - WLAN_HAL_SET_PREF_NETWORK_RSP = 148, - WLAN_HAL_SET_RSSI_FILTER_REQ = 149, - WLAN_HAL_SET_RSSI_FILTER_RSP = 150, - WLAN_HAL_UPDATE_SCAN_PARAM_REQ = 151, - WLAN_HAL_UPDATE_SCAN_PARAM_RSP = 152, - WLAN_HAL_PREF_NETW_FOUND_IND = 153, - - WLAN_HAL_SET_TX_PER_TRACKING_REQ = 154, - WLAN_HAL_SET_TX_PER_TRACKING_RSP = 155, - WLAN_HAL_TX_PER_HIT_IND = 156, - - WLAN_HAL_8023_MULTICAST_LIST_REQ = 157, - WLAN_HAL_8023_MULTICAST_LIST_RSP = 158, - - WLAN_HAL_SET_PACKET_FILTER_REQ = 159, - WLAN_HAL_SET_PACKET_FILTER_RSP = 160, - WLAN_HAL_PACKET_FILTER_MATCH_COUNT_REQ = 161, - WLAN_HAL_PACKET_FILTER_MATCH_COUNT_RSP = 162, - WLAN_HAL_CLEAR_PACKET_FILTER_REQ = 163, - WLAN_HAL_CLEAR_PACKET_FILTER_RSP = 164, - /*This is temp fix. Should be removed once - * Host and Riva code is in sync*/ - WLAN_HAL_INIT_SCAN_CON_REQ = 165, - - WLAN_HAL_SET_POWER_PARAMS_REQ = 166, - WLAN_HAL_SET_POWER_PARAMS_RSP = 167, - - WLAN_HAL_TSM_STATS_REQ = 168, - WLAN_HAL_TSM_STATS_RSP = 169, - - // wake reason indication (WOW) - WLAN_HAL_WAKE_REASON_IND = 170, - // GTK offload support - WLAN_HAL_GTK_OFFLOAD_REQ = 171, - WLAN_HAL_GTK_OFFLOAD_RSP = 172, - WLAN_HAL_GTK_OFFLOAD_GETINFO_REQ = 173, - WLAN_HAL_GTK_OFFLOAD_GETINFO_RSP = 174, - - WLAN_HAL_FEATURE_CAPS_EXCHANGE_REQ = 175, - WLAN_HAL_FEATURE_CAPS_EXCHANGE_RSP = 176, - WLAN_HAL_EXCLUDE_UNENCRYPTED_IND = 177, - - WLAN_HAL_SET_THERMAL_MITIGATION_REQ = 178, - WLAN_HAL_SET_THERMAL_MITIGATION_RSP = 179, - - WLAN_HAL_UPDATE_VHT_OP_MODE_REQ = 182, - WLAN_HAL_UPDATE_VHT_OP_MODE_RSP = 183, - - WLAN_HAL_P2P_NOA_START_IND = 184, - - WLAN_HAL_GET_ROAM_RSSI_REQ = 185, - WLAN_HAL_GET_ROAM_RSSI_RSP = 186, - - WLAN_HAL_CLASS_B_STATS_IND = 187, - WLAN_HAL_DEL_BA_IND = 188, - WLAN_HAL_DHCP_START_IND = 189, - WLAN_HAL_DHCP_STOP_IND = 190, - WLAN_ROAM_SCAN_OFFLOAD_REQ = 191, - WLAN_ROAM_SCAN_OFFLOAD_RSP = 192, - WLAN_HAL_WIFI_PROXIMITY_REQ = 193, - WLAN_HAL_WIFI_PROXIMITY_RSP = 194, - - WLAN_HAL_START_SPECULATIVE_PS_POLLS_REQ = 195, - WLAN_HAL_START_SPECULATIVE_PS_POLLS_RSP = 196, - WLAN_HAL_STOP_SPECULATIVE_PS_POLLS_IND = 197, - - WLAN_HAL_TDLS_LINK_ESTABLISHED_REQ = 198, - WLAN_HAL_TDLS_LINK_ESTABLISHED_RSP = 199, - WLAN_HAL_TDLS_LINK_TEARDOWN_REQ = 200, - WLAN_HAL_TDLS_LINK_TEARDOWN_RSP = 201, - WLAN_HAL_TDLS_IND = 202, - WLAN_HAL_IBSS_PEER_INACTIVITY_IND = 203, - - /* Scan Offload APIs */ - WLAN_HAL_START_SCAN_OFFLOAD_REQ = 204, - WLAN_HAL_START_SCAN_OFFLOAD_RSP = 205, - WLAN_HAL_STOP_SCAN_OFFLOAD_REQ = 206, - WLAN_HAL_STOP_SCAN_OFFLOAD_RSP = 207, - WLAN_HAL_UPDATE_CHANNEL_LIST_REQ = 208, - WLAN_HAL_UPDATE_CHANNEL_LIST_RSP = 209, - WLAN_HAL_OFFLOAD_SCAN_EVENT_IND = 210, - - /* APIs to offload TCP/UDP Heartbeat handshakes */ - WLAN_HAL_LPHB_CFG_REQ = 211, - WLAN_HAL_LPHB_CFG_RSP = 212, - WLAN_HAL_LPHB_IND = 213, - - WLAN_HAL_ADD_PERIODIC_TX_PTRN_IND = 214, - WLAN_HAL_DEL_PERIODIC_TX_PTRN_IND = 215, - WLAN_HAL_PERIODIC_TX_PTRN_FW_IND = 216, - - // Events to set Per-Band Tx Power Limit - WLAN_HAL_SET_MAX_TX_POWER_PER_BAND_REQ = 217, - WLAN_HAL_SET_MAX_TX_POWER_PER_BAND_RSP = 218, - - /* Reliable Multicast using Leader Based Protocol */ - WLAN_HAL_LBP_LEADER_REQ = 219, - WLAN_HAL_LBP_LEADER_RSP = 220, - WLAN_HAL_LBP_UPDATE_IND = 221, - - /* Batchscan */ - WLAN_HAL_BATCHSCAN_SET_REQ = 222, - WLAN_HAL_BATCHSCAN_SET_RSP = 223, - WLAN_HAL_BATCHSCAN_TRIGGER_RESULT_IND = 224, - WLAN_HAL_BATCHSCAN_RESULT_IND = 225, - WLAN_HAL_BATCHSCAN_STOP_IND = 226, - - WLAN_HAL_GET_IBSS_PEER_INFO_REQ = 227, - WLAN_HAL_GET_IBSS_PEER_INFO_RSP = 228, - - WLAN_HAL_RATE_UPDATE_IND = 229, - - /* Tx Fail for weak link notification */ - WLAN_HAL_TX_FAIL_MONITOR_IND = 230, - WLAN_HAL_TX_FAIL_IND = 231, - - /* Multi-hop IP routing offload */ - WLAN_HAL_IP_FORWARD_TABLE_UPDATE_IND = 232, - - WLAN_HAL_MSG_MAX = WLAN_HAL_MSG_TYPE_MAX_ENUM_SIZE -}tHalHostMsgType; - -/* Enumeration for Version */ -typedef enum -{ - WLAN_HAL_MSG_VERSION0 = 0, - WLAN_HAL_MSG_VERSION1 = 1, - WLAN_HAL_MSG_WCNSS_CTRL_VERSION = 0x7FFF, /*define as 2 bytes data*/ - WLAN_HAL_MSG_VERSION_MAX_FIELD = WLAN_HAL_MSG_WCNSS_CTRL_VERSION -}tHalHostMsgVersion; - -/* Enumeration for Boolean - False/True, On/Off */ -typedef enum tagAniBoolean -{ - eANI_BOOLEAN_FALSE = 0, - eANI_BOOLEAN_TRUE, - eANI_BOOLEAN_OFF = 0, - eANI_BOOLEAN_ON = 1, - eANI_BOOLEAN_MAX_FIELD = 0x7FFFFFFF /* define as 4 bytes data */ -} eAniBoolean; - -typedef enum -{ - eDRIVER_TYPE_PRODUCTION = 0, - eDRIVER_TYPE_MFG = 1, - eDRIVER_TYPE_DVT = 2, - eDRIVER_TYPE_MAX = WLAN_HAL_MAX_ENUM_SIZE -} tDriverType; - -typedef enum -{ - HAL_STOP_TYPE_SYS_RESET, - HAL_STOP_TYPE_SYS_DEEP_SLEEP, - HAL_STOP_TYPE_RF_KILL, - HAL_STOP_TYPE_MAX = WLAN_HAL_MAX_ENUM_SIZE -}tHalStopType; - -typedef enum -{ - eHAL_SYS_MODE_NORMAL, - eHAL_SYS_MODE_LEARN, - eHAL_SYS_MODE_SCAN, - eHAL_SYS_MODE_PROMISC, - eHAL_SYS_MODE_SUSPEND_LINK, - eHAL_SYS_MODE_ROAM_SCAN, - eHAL_SYS_MODE_ROAM_SUSPEND_LINK, - eHAL_SYS_MODE_OEM_DATA, - eHAL_SYS_MODE_MAX = WLAN_HAL_MAX_ENUM_SIZE -} eHalSysMode; - -typedef enum -{ - PHY_SINGLE_CHANNEL_CENTERED = 0, // 20MHz IF bandwidth centered on IF carrier - PHY_DOUBLE_CHANNEL_LOW_PRIMARY = 1, // 40MHz IF bandwidth with lower 20MHz supporting the primary channel - PHY_DOUBLE_CHANNEL_CENTERED = 2, // 40MHz IF bandwidth centered on IF carrier - PHY_DOUBLE_CHANNEL_HIGH_PRIMARY = 3, // 40MHz IF bandwidth with higher 20MHz supporting the primary channel -#ifdef WLAN_FEATURE_11AC - PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED = 4, //20/40MHZ offset LOW 40/80MHZ offset CENTERED - PHY_QUADRUPLE_CHANNEL_20MHZ_CENTERED_40MHZ_CENTERED = 5, //20/40MHZ offset CENTERED 40/80MHZ offset CENTERED - PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_CENTERED = 6, //20/40MHZ offset HIGH 40/80MHZ offset CENTERED - PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW = 7,//20/40MHZ offset LOW 40/80MHZ offset LOW - PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW = 8, //20/40MHZ offset HIGH 40/80MHZ offset LOW - PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH = 9, //20/40MHZ offset LOW 40/80MHZ offset HIGH - PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH = 10,//20/40MHZ offset-HIGH 40/80MHZ offset HIGH -#endif - PHY_CHANNEL_BONDING_STATE_MAX = WLAN_HAL_MAX_ENUM_SIZE -}ePhyChanBondState; - -// Spatial Multiplexing(SM) Power Save mode -typedef enum eSirMacHTMIMOPowerSaveState -{ - eSIR_HT_MIMO_PS_STATIC = 0, // Static SM Power Save mode - eSIR_HT_MIMO_PS_DYNAMIC = 1, // Dynamic SM Power Save mode - eSIR_HT_MIMO_PS_NA = 2, // reserved - eSIR_HT_MIMO_PS_NO_LIMIT = 3, // SM Power Save disabled - eSIR_HT_MIMO_PS_MAX = WLAN_HAL_MAX_ENUM_SIZE -} tSirMacHTMIMOPowerSaveState; - -/* each station added has a rate mode which specifies the sta attributes */ -typedef enum eStaRateMode { - eSTA_TAURUS = 0, - eSTA_TITAN, - eSTA_POLARIS, - eSTA_11b, - eSTA_11bg, - eSTA_11a, - eSTA_11n, -#ifdef WLAN_FEATURE_11AC - eSTA_11ac, -#endif - eSTA_INVALID_RATE_MODE = WLAN_HAL_MAX_ENUM_SIZE -} tStaRateMode, *tpStaRateMode; - -#define SIR_NUM_11B_RATES 4 //1,2,5.5,11 -#define SIR_NUM_11A_RATES 8 //6,9,12,18,24,36,48,54 -#define SIR_NUM_POLARIS_RATES 3 //72,96,108 - -#define SIR_MAC_MAX_SUPPORTED_MCS_SET 16 - - -typedef enum eSirBssType -{ - eSIR_INFRASTRUCTURE_MODE, - eSIR_INFRA_AP_MODE, //Added for softAP support - eSIR_IBSS_MODE, - eSIR_BTAMP_STA_MODE, //Added for BT-AMP support - eSIR_BTAMP_AP_MODE, //Added for BT-AMP support - eSIR_AUTO_MODE, - eSIR_DONOT_USE_BSS_TYPE = WLAN_HAL_MAX_ENUM_SIZE -} tSirBssType; - -typedef enum eSirNwType -{ - eSIR_11A_NW_TYPE, - eSIR_11B_NW_TYPE, - eSIR_11G_NW_TYPE, - eSIR_11N_NW_TYPE, - eSIR_DONOT_USE_NW_TYPE = WLAN_HAL_MAX_ENUM_SIZE -} tSirNwType; - -typedef tANI_U16 tSirMacBeaconInterval; - -#define SIR_MAC_RATESET_EID_MAX 12 - -typedef enum eSirMacHTOperatingMode -{ - eSIR_HT_OP_MODE_PURE, // No Protection - eSIR_HT_OP_MODE_OVERLAP_LEGACY, // Overlap Legacy device present, protection is optional - eSIR_HT_OP_MODE_NO_LEGACY_20MHZ_HT, // No legacy device, but 20 MHz HT present - eSIR_HT_OP_MODE_MIXED, // Protection is required - eSIR_HT_OP_MODE_MAX = WLAN_HAL_MAX_ENUM_SIZE -} tSirMacHTOperatingMode; - -/// Encryption type enum used with peer -typedef enum eAniEdType -{ - eSIR_ED_NONE, - eSIR_ED_WEP40, - eSIR_ED_WEP104, - eSIR_ED_TKIP, - eSIR_ED_CCMP, - eSIR_ED_WPI, - eSIR_ED_AES_128_CMAC, - eSIR_ED_NOT_IMPLEMENTED = WLAN_HAL_MAX_ENUM_SIZE -} tAniEdType; - -#define WLAN_MAX_KEY_RSC_LEN 16 -#define WLAN_WAPI_KEY_RSC_LEN 16 - -/// MAX key length when ULA is used -#define SIR_MAC_MAX_KEY_LENGTH 32 -#define SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS 4 - -/// Enum to specify whether key is used -/// for TX only, RX only or both -typedef enum eAniKeyDirection -{ - eSIR_TX_ONLY, - eSIR_RX_ONLY, - eSIR_TX_RX, - eSIR_TX_DEFAULT, - eSIR_DONOT_USE_KEY_DIRECTION = WLAN_HAL_MAX_ENUM_SIZE -} tAniKeyDirection; - -typedef enum eAniWepType -{ - eSIR_WEP_STATIC, - eSIR_WEP_DYNAMIC, - eSIR_WEP_MAX = WLAN_HAL_MAX_ENUM_SIZE -} tAniWepType; - -typedef enum eSriLinkState { - - eSIR_LINK_IDLE_STATE = 0, - eSIR_LINK_PREASSOC_STATE = 1, - eSIR_LINK_POSTASSOC_STATE = 2, - eSIR_LINK_AP_STATE = 3, - eSIR_LINK_IBSS_STATE = 4, - - /* BT-AMP Case */ - eSIR_LINK_BTAMP_PREASSOC_STATE = 5, - eSIR_LINK_BTAMP_POSTASSOC_STATE = 6, - eSIR_LINK_BTAMP_AP_STATE = 7, - eSIR_LINK_BTAMP_STA_STATE = 8, - - /* Reserved for HAL Internal Use */ - eSIR_LINK_LEARN_STATE = 9, - eSIR_LINK_SCAN_STATE = 10, - eSIR_LINK_FINISH_SCAN_STATE = 11, - eSIR_LINK_INIT_CAL_STATE = 12, - eSIR_LINK_FINISH_CAL_STATE = 13, -#ifdef WLAN_FEATURE_P2P - eSIR_LINK_LISTEN_STATE = 14, - eSIR_LINK_SEND_ACTION_STATE = 15, -#endif - eSIR_LINK_MAX = WLAN_HAL_MAX_ENUM_SIZE -} tSirLinkState; - -typedef enum -{ - HAL_SUMMARY_STATS_INFO = 0x00000001, - HAL_GLOBAL_CLASS_A_STATS_INFO = 0x00000002, - HAL_GLOBAL_CLASS_B_STATS_INFO = 0x00000004, - HAL_GLOBAL_CLASS_C_STATS_INFO = 0x00000008, - HAL_GLOBAL_CLASS_D_STATS_INFO = 0x00000010, - HAL_PER_STA_STATS_INFO = 0x00000020 -}eHalStatsMask; - -/* BT-AMP events type */ -typedef enum -{ - BTAMP_EVENT_CONNECTION_START, - BTAMP_EVENT_CONNECTION_STOP, - BTAMP_EVENT_CONNECTION_TERMINATED, - BTAMP_EVENT_TYPE_MAX = WLAN_HAL_MAX_ENUM_SIZE, //This and beyond are invalid values -} tBtAmpEventType; - -//*************************************************************** - - -/*******************PE Statistics*************************/ -typedef enum -{ - PE_SUMMARY_STATS_INFO = 0x00000001, - PE_GLOBAL_CLASS_A_STATS_INFO = 0x00000002, - PE_GLOBAL_CLASS_B_STATS_INFO = 0x00000004, - PE_GLOBAL_CLASS_C_STATS_INFO = 0x00000008, - PE_GLOBAL_CLASS_D_STATS_INFO = 0x00000010, - PE_PER_STA_STATS_INFO = 0x00000020, - PE_STATS_TYPE_MAX = WLAN_HAL_MAX_ENUM_SIZE //This and beyond are invalid values -}ePEStatsMask; - -/*--------------------------------------------------------------------------- - Message definitons - All the messages below need to be packed - ---------------------------------------------------------------------------*/ - -#if defined(__ANI_COMPILER_PRAGMA_PACK_STACK) -#pragma pack(push, 1) -#elif defined(__ANI_COMPILER_PRAGMA_PACK) -#pragma pack(1) -#else -#endif - -/// Definition for HAL API Version. -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 revision; - tANI_U8 version; - tANI_U8 minor; - tANI_U8 major; -} tWcnssWlanVersion, *tpWcnssWlanVersion; - -/// Definition for Encryption Keys -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 keyId; - tANI_U8 unicast; // 0 for multicast - tAniKeyDirection keyDirection; - tANI_U8 keyRsc[WLAN_MAX_KEY_RSC_LEN]; // Usage is unknown - tANI_U8 paeRole; // =1 for authenticator,=0 for supplicant - tANI_U16 keyLength; - tANI_U8 key[SIR_MAC_MAX_KEY_LENGTH]; -} tSirKeys, *tpSirKeys; - - -//SetStaKeyParams Moving here since it is shared by configbss/setstakey msgs -typedef PACKED_PRE struct PACKED_POST -{ - /*STA Index*/ - tANI_U16 staIdx; - - /*Encryption Type used with peer*/ - tAniEdType encType; - - /*STATIC/DYNAMIC - valid only for WEP*/ - tAniWepType wepType; - - /*Default WEP key, valid only for static WEP, must between 0 and 3.*/ - tANI_U8 defWEPIdx; - - /* valid only for non-static WEP encyrptions */ - tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS]; - - /*Control for Replay Count, 1= Single TID based replay count on Tx - 0 = Per TID based replay count on TX */ - tANI_U8 singleTidRc; - -} tSetStaKeyParams, *tpSetStaKeyParams; - - - -/* 4-byte control message header used by HAL*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalHostMsgType msgType:16; - tHalHostMsgVersion msgVersion:16; - tANI_U32 msgLen; -} tHalMsgHeader, *tpHalMsgHeader; - -/* Config format required by HAL for each CFG item*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* Cfg Id. The Id required by HAL is exported by HAL - * in shared header file between UMAC and HAL.*/ - tANI_U16 uCfgId; - - /* Length of the Cfg. This parameter is used to go to next cfg - * in the TLV format.*/ - tANI_U16 uCfgLen; - - /* Padding bytes for unaligned address's */ - tANI_U16 uCfgPadBytes; - - /* Reserve bytes for making cfgVal to align address */ - tANI_U16 uCfgReserve; - - /* Following the uCfgLen field there should be a 'uCfgLen' bytes - * containing the uCfgValue ; tANI_U8 uCfgValue[uCfgLen] */ -} tHalCfg, *tpHalCfg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_START_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST sHalMacStartParameters -{ - /* Drive Type - Production or FTM etc */ - tDriverType driverType; - - /*Length of the config buffer*/ - tANI_U32 uConfigBufferLen; - - /* Following this there is a TLV formatted buffer of length - * "uConfigBufferLen" bytes containing all config values. - * The TLV is expected to be formatted like this: - * 0 15 31 31+CFG_LEN-1 length-1 - * | CFG_ID | CFG_LEN | CFG_BODY | CFG_ID |......| - */ -} tHalMacStartParameters, *tpHalMacStartParameters; - -typedef PACKED_PRE struct PACKED_POST -{ - /* Note: The length specified in tHalMacStartReqMsg messages should be - * header.msgLen = sizeof(tHalMacStartReqMsg) + uConfigBufferLen */ - tHalMsgHeader header; - tHalMacStartParameters startReqParams; -} tHalMacStartReqMsg, *tpHalMacStartReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_START_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST sHalMacStartRspParameters -{ - /*success or failure */ - tANI_U16 status; - - /*Max number of STA supported by the device*/ - tANI_U8 ucMaxStations; - - /*Max number of BSS supported by the device*/ - tANI_U8 ucMaxBssids; - - /*API Version */ - tWcnssWlanVersion wcnssWlanVersion; - - /*CRM build information */ - tANI_U8 wcnssCrmVersionString[WLAN_HAL_VERSION_LENGTH]; - - /*hardware/chipset/misc version information */ - tANI_U8 wcnssWlanVersionString[WLAN_HAL_VERSION_LENGTH]; - -} tHalMacStartRspParams, *tpHalMacStartRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalMacStartRspParams startRspParams; -} tHalMacStartRspMsg, *tpHalMacStartRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_STOP_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*The reason for which the device is being stopped*/ - tHalStopType reason; - -}tHalMacStopReqParams, *tpHalMacStopReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalMacStopReqParams stopReqParams; -} tHalMacStopReqMsg, *tpHalMacStopReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_STOP_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - -}tHalMacStopRspParams, *tpHalMacStopRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalMacStopRspParams stopRspParams; -} tHalMacStopRspMsg, *tpHalMacStopRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_UPDATE_CFG_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Length of the config buffer. Allows UMAC to update multiple CFGs */ - tANI_U32 uConfigBufferLen; - - /* Following this there is a TLV formatted buffer of length - * "uConfigBufferLen" bytes containing all config values. - * The TLV is expected to be formatted like this: - * 0 15 31 31+CFG_LEN-1 length-1 - * | CFG_ID | CFG_LEN | CFG_BODY | CFG_ID |......| - */ -} tHalUpdateCfgReqParams, *tpHalUpdateCfgReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - /* Note: The length specified in tHalUpdateCfgReqMsg messages should be - * header.msgLen = sizeof(tHalUpdateCfgReqMsg) + uConfigBufferLen */ - tHalMsgHeader header; - tHalUpdateCfgReqParams updateCfgReqParams; -} tHalUpdateCfgReqMsg, *tpHalUpdateCfgReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_UPDATE_CFG_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - -}tHalUpdateCfgRspParams, *tpHalUpdateCfgRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalUpdateCfgRspParams updateCfgRspParams; -} tHalUpdateCfgRspMsg, *tpHalUpdateCfgRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_INIT_SCAN_REQ ----------------------------------------------------------------------------*/ - -/// Frame control field format (2 bytes) -typedef __ani_attr_pre_packed struct sSirMacFrameCtl -{ - -#ifndef ANI_LITTLE_BIT_ENDIAN - - tANI_U8 subType :4; - tANI_U8 type :2; - tANI_U8 protVer :2; - - tANI_U8 order :1; - tANI_U8 wep :1; - tANI_U8 moreData :1; - tANI_U8 powerMgmt :1; - tANI_U8 retry :1; - tANI_U8 moreFrag :1; - tANI_U8 fromDS :1; - tANI_U8 toDS :1; - -#else - - tANI_U8 protVer :2; - tANI_U8 type :2; - tANI_U8 subType :4; - - tANI_U8 toDS :1; - tANI_U8 fromDS :1; - tANI_U8 moreFrag :1; - tANI_U8 retry :1; - tANI_U8 powerMgmt :1; - tANI_U8 moreData :1; - tANI_U8 wep :1; - tANI_U8 order :1; - -#endif - -} __ani_attr_packed tSirMacFrameCtl, *tpSirMacFrameCtl; - -/// Sequence control field -typedef __ani_attr_pre_packed struct sSirMacSeqCtl -{ - tANI_U8 fragNum : 4; - tANI_U8 seqNumLo : 4; - tANI_U8 seqNumHi : 8; -} __ani_attr_packed tSirMacSeqCtl, *tpSirMacSeqCtl; - -/// Management header format -typedef __ani_attr_pre_packed struct sSirMacMgmtHdr -{ - tSirMacFrameCtl fc; - tANI_U8 durationLo; - tANI_U8 durationHi; - tANI_U8 da[6]; - tANI_U8 sa[6]; - tANI_U8 bssId[6]; - tSirMacSeqCtl seqControl; -} __ani_attr_packed tSirMacMgmtHdr, *tpSirMacMgmtHdr; - -/// Scan Entry to hold active BSS idx's -typedef __ani_attr_pre_packed struct sSirScanEntry -{ - tANI_U8 bssIdx[HAL_NUM_BSSID]; - tANI_U8 activeBSScnt; -}__ani_attr_packed tSirScanEntry, *ptSirScanEntry; - -typedef PACKED_PRE struct PACKED_POST { - - /*LEARN - AP Role - SCAN - STA Role*/ - eHalSysMode scanMode; - - /*BSSID of the BSS*/ - tSirMacAddr bssid; - - /*Whether BSS needs to be notified*/ - tANI_U8 notifyBss; - - /*Kind of frame to be used for notifying the BSS (Data Null, QoS Null, or - CTS to Self). Must always be a valid frame type.*/ - tANI_U8 frameType; - - /*UMAC has the option of passing the MAC frame to be used for notifying - the BSS. If non-zero, HAL will use the MAC frame buffer pointed to by - macMgmtHdr. If zero, HAL will generate the appropriate MAC frame based on - frameType.*/ - tANI_U8 frameLength; - - /* Following the framelength there is a MAC frame buffer if frameLength - is non-zero. */ - tSirMacMgmtHdr macMgmtHdr; - - /*Entry to hold number of active BSS idx's*/ - tSirScanEntry scanEntry; - -} tInitScanParams, * tpInitScanParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tInitScanParams initScanParams; -} tHalInitScanReqMsg, *tpHalInitScanReqMsg; - -typedef PACKED_PRE struct PACKED_POST { - - /*LEARN - AP Role - SCAN - STA Role*/ - eHalSysMode scanMode; - - /*BSSID of the BSS*/ - tSirMacAddr bssid; - - /*Whether BSS needs to be notified*/ - tANI_U8 notifyBss; - - /*Kind of frame to be used for notifying the BSS (Data Null, QoS Null, or - CTS to Self). Must always be a valid frame type.*/ - tANI_U8 frameType; - - /*UMAC has the option of passing the MAC frame to be used for notifying - the BSS. If non-zero, HAL will use the MAC frame buffer pointed to by - macMgmtHdr. If zero, HAL will generate the appropriate MAC frame based on - frameType.*/ - tANI_U8 frameLength; - - /* Following the framelength there is a MAC frame buffer if frameLength - is non-zero. */ - tSirMacMgmtHdr macMgmtHdr; - - /*Entry to hold number of active BSS idx's*/ - tSirScanEntry scanEntry; - - /* Single NoA usage in Scanning */ - tANI_U8 useNoA; - - /* Indicates the scan duration (in ms) */ - tANI_U16 scanDuration; - -} tInitScanConParams, * tpInitScanConParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tInitScanConParams initScanParams; -} tHalInitScanConReqMsg, *tpHalInitScanConReqMsg; - - -/*--------------------------------------------------------------------------- - WLAN_HAL_INIT_SCAN_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - -}tHalInitScanRspParams, *tpHalInitScanRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalInitScanRspParams initScanRspParams; -} tHalInitScanRspMsg, *tpHalInitScanRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_START_SCAN_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*Indicates the channel to scan*/ - tANI_U8 scanChannel; - - } tStartScanParams, * tpStartScanParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tStartScanParams startScanParams; -} tHalStartScanReqMsg, *tpHalStartScanReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_START_SCAN_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - - tANI_U32 startTSF[2]; - tPowerdBm txMgmtPower; - -}tHalStartScanRspParams, *tpHalStartScanRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalStartScanRspParams startScanRspParams; -} tHalStartScanRspMsg, *tpHalStartScanRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_END_SCAN_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*Indicates the channel to stop scanning. Not used really. But retained - for symmetry with "start Scan" message. It can also help in error - check if needed.*/ - tANI_U8 scanChannel; - -} tEndScanParams, *tpEndScanParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tEndScanParams endScanParams; -} tHalEndScanReqMsg, *tpHalEndScanReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_END_SCAN_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - -}tHalEndScanRspParams, *tpHalEndScanRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalEndScanRspParams endScanRspParams; -} tHalEndScanRspMsg, *tpHalEndScanRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_FINISH_SCAN_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Identifies the operational state of the AP/STA - * LEARN - AP Role SCAN - STA Role */ - eHalSysMode scanMode; - - /*Operating channel to tune to.*/ - tANI_U8 currentOperChannel; - - /*Channel Bonding state If 20/40 MHz is operational, this will indicate the - 40 MHz extension channel in combination with the control channel*/ - ePhyChanBondState cbState; - - /*BSSID of the BSS*/ - tSirMacAddr bssid; - - /*Whether BSS needs to be notified*/ - tANI_U8 notifyBss; - - /*Kind of frame to be used for notifying the BSS (Data Null, QoS Null, or - CTS to Self). Must always be a valid frame type.*/ - tANI_U8 frameType; - - /*UMAC has the option of passing the MAC frame to be used for notifying - the BSS. If non-zero, HAL will use the MAC frame buffer pointed to by - macMgmtHdr. If zero, HAL will generate the appropriate MAC frame based on - frameType.*/ - tANI_U8 frameLength; - - /*Following the framelength there is a MAC frame buffer if frameLength - is non-zero.*/ - tSirMacMgmtHdr macMgmtHdr; - - /*Entry to hold number of active BSS idx's*/ - tSirScanEntry scanEntry; - -} tFinishScanParams, *tpFinishScanParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tFinishScanParams finishScanParams; -} tHalFinishScanReqMsg, *tpHalFinishScanReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_FINISH_SCAN_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - -}tHalFinishScanRspParams, *tpHalFinishScanRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalFinishScanRspParams finishScanRspParams; -} tHalFinishScanRspMsg, *tpHalFinishScanRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_CONFIG_STA_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST { - /* - * For Self STA Entry: this represents Self Mode. - * For Peer Stations, this represents the mode of the peer. - * On Station: - * --this mode is updated when PE adds the Self Entry. - * -- OR when PE sends 'ADD_BSS' message and station context in BSS is used to indicate the mode of the AP. - * ON AP: - * -- this mode is updated when PE sends 'ADD_BSS' and Sta entry for that BSS is used - * to indicate the self mode of the AP. - * -- OR when a station is associated, PE sends 'ADD_STA' message with this mode updated. - */ - - tStaRateMode opRateMode; - // 11b, 11a and aniLegacyRates are IE rates which gives rate in unit of 500Kbps - tANI_U16 llbRates[SIR_NUM_11B_RATES]; - tANI_U16 llaRates[SIR_NUM_11A_RATES]; - tANI_U16 aniLegacyRates[SIR_NUM_POLARIS_RATES]; - tANI_U16 reserved; - - //Taurus only supports 26 Titan Rates(no ESF/concat Rates will be supported) - //First 26 bits are reserved for those Titan rates and - //the last 4 bits(bit28-31) for Taurus, 2(bit26-27) bits are reserved. - tANI_U32 aniEnhancedRateBitmap; //Titan and Taurus Rates - - /* - * 0-76 bits used, remaining reserved - * bits 0-15 and 32 should be set. - */ - tANI_U8 supportedMCSSet[SIR_MAC_MAX_SUPPORTED_MCS_SET]; - - /* - * RX Highest Supported Data Rate defines the highest data - * rate that the STA is able to receive, in unites of 1Mbps. - * This value is derived from "Supported MCS Set field" inside - * the HT capability element. - */ - tANI_U16 rxHighestDataRate; - -} tSirSupportedRates, *tpSirSupportedRates; - -typedef PACKED_PRE struct PACKED_POST -{ - /*BSSID of STA*/ - tSirMacAddr bssId; - - /*ASSOC ID, as assigned by UMAC*/ - tANI_U16 assocId; - - /* STA entry Type: 0 - Self, 1 - Other/Peer, 2 - BSSID, 3 - BCAST */ - tANI_U8 staType; - - /*Short Preamble Supported.*/ - tANI_U8 shortPreambleSupported; - - /*MAC Address of STA*/ - tSirMacAddr staMac; - - /*Listen interval of the STA*/ - tANI_U16 listenInterval; - - /*Support for 11e/WMM*/ - tANI_U8 wmmEnabled; - - /*11n HT capable STA*/ - tANI_U8 htCapable; - - /*TX Width Set: 0 - 20 MHz only, 1 - 20/40 MHz*/ - tANI_U8 txChannelWidthSet; - - /*RIFS mode 0 - NA, 1 - Allowed */ - tANI_U8 rifsMode; - - /*L-SIG TXOP Protection mechanism - 0 - No Support, 1 - Supported - SG - there is global field */ - tANI_U8 lsigTxopProtection; - - /*Max Ampdu Size supported by STA. TPE programming. - 0 : 8k , 1 : 16k, 2 : 32k, 3 : 64k */ - tANI_U8 maxAmpduSize; - - /*Max Ampdu density. Used by RA. 3 : 0~7 : 2^(11nAMPDUdensity -4)*/ - tANI_U8 maxAmpduDensity; - - /*Max AMSDU size 1 : 3839 bytes, 0 : 7935 bytes*/ - tANI_U8 maxAmsduSize; - - /*Short GI support for 40Mhz packets*/ - tANI_U8 fShortGI40Mhz; - - /*Short GI support for 20Mhz packets*/ - tANI_U8 fShortGI20Mhz; - - /*Robust Management Frame (RMF) enabled/disabled*/ - tANI_U8 rmfEnabled; - - /* The unicast encryption type in the association */ - tANI_U32 encryptType; - - /*HAL should update the existing STA entry, if this flag is set. UMAC - will set this flag in case of RE-ASSOC, where we want to reuse the old - STA ID. 0 = Add, 1 = Update*/ - tANI_U8 action; - - /*U-APSD Flags: 1b per AC. Encoded as follows: - b7 b6 b5 b4 b3 b2 b1 b0 = - X X X X BE BK VI VO */ - tANI_U8 uAPSD; - - /*Max SP Length*/ - tANI_U8 maxSPLen; - - /*11n Green Field preamble support - 0 - Not supported, 1 - Supported */ - tANI_U8 greenFieldCapable; - - /*MIMO Power Save mode*/ - tSirMacHTMIMOPowerSaveState mimoPS; - - /*Delayed BA Support*/ - tANI_U8 delayedBASupport; - - /*Max AMPDU duration in 32us*/ - tANI_U8 us32MaxAmpduDuration; - - /*HT STA should set it to 1 if it is enabled in BSS. HT STA should set - it to 0 if AP does not support it. This indication is sent to HAL and - HAL uses this flag to pickup up appropriate 40Mhz rates.*/ - tANI_U8 fDsssCckMode40Mhz; - - /* Valid STA Idx when action=Update. Set to 0xFF when invalid! - Retained for backward compalibity with existing HAL code*/ - tANI_U8 staIdx; - - /* BSSID of BSS to which station is associated. Set to 0xFF when invalid. - Retained for backward compalibity with existing HAL code*/ - tANI_U8 bssIdx; - - tANI_U8 p2pCapableSta; - - /*Reserved to align next field on a dword boundary*/ - tANI_U8 reserved; - - /*These rates are the intersection of peer and self capabilities.*/ - tSirSupportedRates supportedRates; - -} tConfigStaParams, *tpConfigStaParams; - -/*------------------------------------------------------------------------ - * WLAN_HAL_CONFIG_STA_REQ - * ----------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST { - /* - * For Self STA Entry: this represents Self Mode. - * For Peer Stations, this represents the mode of the peer. - * On Station: - * --this mode is updated when PE adds the Self Entry. - * -- OR when PE sends 'ADD_BSS' message and station context in BSS is used to indicate the mode of the AP. - * ON AP: - * -- this mode is updated when PE sends 'ADD_BSS' and Sta entry for that BSS is used - * to indicate the self mode of the AP. - * -- OR when a station is associated, PE sends 'ADD_STA' message with this mode updated. - */ - - tStaRateMode opRateMode; - // 11b, 11a and aniLegacyRates are IE rates which gives rate in unit of 500Kbps - tANI_U16 llbRates[SIR_NUM_11B_RATES]; - tANI_U16 llaRates[SIR_NUM_11A_RATES]; - tANI_U16 aniLegacyRates[SIR_NUM_POLARIS_RATES]; - tANI_U16 reserved; - - //Taurus only supports 26 Titan Rates(no ESF/concat Rates will be supported) - //First 26 bits are reserved for those Titan rates and - //the last 4 bits(bit28-31) for Taurus, 2(bit26-27) bits are reserved. - tANI_U32 aniEnhancedRateBitmap; //Titan and Taurus Rates - - /* - * 0-76 bits used, remaining reserved - * bits 0-15 and 32 should be set. - */ - tANI_U8 supportedMCSSet[SIR_MAC_MAX_SUPPORTED_MCS_SET]; - - /* - * RX Highest Supported Data Rate defines the highest data - * rate that the STA is able to receive, in unites of 1Mbps. - * This value is derived from "Supported MCS Set field" inside - * the HT capability element. - */ - tANI_U16 rxHighestDataRate; - - /* Indicates the Maximum MCS that can be received for each number - * of spacial streams */ - tANI_U16 vhtRxMCSMap; - - /*Indicate the highest VHT data rate that the STA is able to receive*/ - tANI_U16 vhtRxHighestDataRate; - - /* Indicates the Maximum MCS that can be transmitted for each number - * of spacial streams */ - tANI_U16 vhtTxMCSMap; - - /*Indicate the highest VHT data rate that the STA is able to transmit*/ - tANI_U16 vhtTxHighestDataRate; - -} tSirSupportedRates_V1, *tpSirSupportedRates_V1; - -typedef PACKED_PRE struct PACKED_POST -{ - /*BSSID of STA*/ - tSirMacAddr bssId; - - /*ASSOC ID, as assigned by UMAC*/ - tANI_U16 assocId; - - /* STA entry Type: 0 - Self, 1 - Other/Peer, 2 - BSSID, 3 - BCAST */ - tANI_U8 staType; - - /*Short Preamble Supported.*/ - tANI_U8 shortPreambleSupported; - - /*MAC Address of STA*/ - tSirMacAddr staMac; - - /*Listen interval of the STA*/ - tANI_U16 listenInterval; - - /*Support for 11e/WMM*/ - tANI_U8 wmmEnabled; - - /*11n HT capable STA*/ - tANI_U8 htCapable; - - /*TX Width Set: 0 - 20 MHz only, 1 - 20/40 MHz*/ - tANI_U8 txChannelWidthSet; - - /*RIFS mode 0 - NA, 1 - Allowed */ - tANI_U8 rifsMode; - - /*L-SIG TXOP Protection mechanism - 0 - No Support, 1 - Supported - SG - there is global field */ - tANI_U8 lsigTxopProtection; - - /*Max Ampdu Size supported by STA. TPE programming. - 0 : 8k , 1 : 16k, 2 : 32k, 3 : 64k */ - tANI_U8 maxAmpduSize; - - /*Max Ampdu density. Used by RA. 3 : 0~7 : 2^(11nAMPDUdensity -4)*/ - tANI_U8 maxAmpduDensity; - - /*Max AMSDU size 1 : 3839 bytes, 0 : 7935 bytes*/ - tANI_U8 maxAmsduSize; - - /*Short GI support for 40Mhz packets*/ - tANI_U8 fShortGI40Mhz; - - /*Short GI support for 20Mhz packets*/ - tANI_U8 fShortGI20Mhz; - - /*Robust Management Frame (RMF) enabled/disabled*/ - tANI_U8 rmfEnabled; - - /* The unicast encryption type in the association */ - tANI_U32 encryptType; - - /*HAL should update the existing STA entry, if this flag is set. UMAC - will set this flag in case of RE-ASSOC, where we want to reuse the old - STA ID. 0 = Add, 1 = Update*/ - tANI_U8 action; - - /*U-APSD Flags: 1b per AC. Encoded as follows: - b7 b6 b5 b4 b3 b2 b1 b0 = - X X X X BE BK VI VO */ - tANI_U8 uAPSD; - - /*Max SP Length*/ - tANI_U8 maxSPLen; - - /*11n Green Field preamble support - 0 - Not supported, 1 - Supported */ - tANI_U8 greenFieldCapable; - - /*MIMO Power Save mode*/ - tSirMacHTMIMOPowerSaveState mimoPS; - - /*Delayed BA Support*/ - tANI_U8 delayedBASupport; - - /*Max AMPDU duration in 32us*/ - tANI_U8 us32MaxAmpduDuration; - - /*HT STA should set it to 1 if it is enabled in BSS. HT STA should set - it to 0 if AP does not support it. This indication is sent to HAL and - HAL uses this flag to pickup up appropriate 40Mhz rates.*/ - tANI_U8 fDsssCckMode40Mhz; - - /* Valid STA Idx when action=Update. Set to 0xFF when invalid! - Retained for backward compalibity with existing HAL code*/ - tANI_U8 staIdx; - - /* BSSID of BSS to which station is associated. Set to 0xFF when invalid. - Retained for backward compalibity with existing HAL code*/ - tANI_U8 bssIdx; - - tANI_U8 p2pCapableSta; - - /*Reserved to align next field on a dword boundary*/ - tANI_U8 htLdpcEnabled:1; - tANI_U8 vhtLdpcEnabled:1; - tANI_U8 vhtTxBFEnabled:1; - tANI_U8 reserved:5; - - /*These rates are the intersection of peer and self capabilities.*/ - tSirSupportedRates_V1 supportedRates; - - tANI_U8 vhtCapable; - tANI_U8 vhtTxChannelWidthSet; - -} tConfigStaParams_V1, *tpConfigStaParams_V1; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - PACKED_PRE union PACKED_POST { - tConfigStaParams configStaParams; - tConfigStaParams_V1 configStaParams_V1; - } uStaParams; -} tConfigStaReqMsg, *tpConfigStaReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_CONFIG_STA_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - - /* Station index; valid only when 'status' field value SUCCESS */ - tANI_U8 staIdx; - - /* BSSID Index of BSS to which the station is associated */ - tANI_U8 bssIdx; - - /* DPU Index for PTK */ - tANI_U8 dpuIndex; - - /* DPU Index for GTK */ - tANI_U8 bcastDpuIndex; - - /*DPU Index for IGTK */ - tANI_U8 bcastMgmtDpuIdx; - - /*PTK DPU signature*/ - tANI_U8 ucUcastSig; - - /*GTK DPU isignature*/ - tANI_U8 ucBcastSig; - - /* IGTK DPU signature*/ - tANI_U8 ucMgmtSig; - - tANI_U8 p2pCapableSta; - -}tConfigStaRspParams, *tpConfigStaRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tConfigStaRspParams configStaRspParams; -}tConfigStaRspMsg, *tpConfigStaRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_DELETE_STA_REQ ----------------------------------------------------------------------------*/ - -/* Delete STA Request params */ -typedef PACKED_PRE struct PACKED_POST -{ - /* Index of STA to delete */ - tANI_U8 staIdx; -} tDeleteStaParams, *tpDeleteStaParams; - -/* Delete STA Request message*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tDeleteStaParams delStaParams; -} tDeleteStaReqMsg, *tpDeleteStaReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_DELETE_STA_RSP ----------------------------------------------------------------------------*/ - -/* Delete STA Response Params */ -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - - /* Index of STA deleted */ - tANI_U8 staId; -} tDeleteStaRspParams, *tpDeleteStaRspParams; - -/* Delete STA Response message*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tDeleteStaRspParams delStaRspParams; -} tDeleteStaRspMsg, *tpDeleteStaRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_CONFIG_BSS_REQ ----------------------------------------------------------------------------*/ - -//12 Bytes long because this structure can be used to represent rate -//and extended rate set IEs. The parser assume this to be at least 12 -typedef __ani_attr_pre_packed struct sSirMacRateSet -{ - tANI_U8 numRates; - tANI_U8 rate[SIR_MAC_RATESET_EID_MAX]; -} __ani_attr_packed tSirMacRateSet; - -// access category record -typedef __ani_attr_pre_packed struct sSirMacAciAifsn -{ -#ifndef ANI_LITTLE_BIT_ENDIAN - tANI_U8 rsvd : 1; - tANI_U8 aci : 2; - tANI_U8 acm : 1; - tANI_U8 aifsn : 4; -#else - tANI_U8 aifsn : 4; - tANI_U8 acm : 1; - tANI_U8 aci : 2; - tANI_U8 rsvd : 1; -#endif -} __ani_attr_packed tSirMacAciAifsn; - -// contention window size -typedef __ani_attr_pre_packed struct sSirMacCW -{ -#ifndef ANI_LITTLE_BIT_ENDIAN - tANI_U8 max : 4; - tANI_U8 min : 4; -#else - tANI_U8 min : 4; - tANI_U8 max : 4; -#endif -} __ani_attr_packed tSirMacCW; - -typedef __ani_attr_pre_packed struct sSirMacEdcaParamRecord -{ - tSirMacAciAifsn aci; - tSirMacCW cw; - tANI_U16 txoplimit; -} __ani_attr_packed tSirMacEdcaParamRecord; - -typedef __ani_attr_pre_packed struct sSirMacSSid -{ - tANI_U8 length; - tANI_U8 ssId[32]; -} __ani_attr_packed tSirMacSSid; - -// Concurrency role. These are generic IDs that identify the various roles -// in the software system. -typedef enum { - HAL_STA_MODE=0, - HAL_STA_SAP_MODE=1, // to support softAp mode . This is misleading. It means AP MODE only. - HAL_P2P_CLIENT_MODE, - HAL_P2P_GO_MODE, - HAL_MONITOR_MODE, -} tHalConMode; - -//This is a bit pattern to be set for each mode -//bit 0 - sta mode -//bit 1 - ap mode -//bit 2 - p2p client mode -//bit 3 - p2p go mode -typedef enum -{ - HAL_STA=1, - HAL_SAP=2, - HAL_STA_SAP=3, //to support sta, softAp mode . This means STA+AP mode - HAL_P2P_CLIENT=4, - HAL_P2P_GO=8, - HAL_MAX_CONCURRENCY_PERSONA=4 -} tHalConcurrencyMode; - -// IFACE PERSONA for different Operating modes -typedef enum -{ - HAL_IFACE_UNKNOWN, - HAL_IFACE_STA_MODE, - HAL_IFACE_P2P_MODE, - HAL_IFACE_MAX -} tHalIfacePersona; - -typedef PACKED_PRE struct PACKED_POST -{ - /* BSSID */ - tSirMacAddr bssId; - - /* Self Mac Address */ - tSirMacAddr selfMacAddr; - - /* BSS type */ - tSirBssType bssType; - - /*Operational Mode: AP =0, STA = 1*/ - tANI_U8 operMode; - - /*Network Type*/ - tSirNwType nwType; - - /*Used to classify PURE_11G/11G_MIXED to program MTU*/ - tANI_U8 shortSlotTimeSupported; - - /*Co-exist with 11a STA*/ - tANI_U8 llaCoexist; - - /*Co-exist with 11b STA*/ - tANI_U8 llbCoexist; - - /*Co-exist with 11g STA*/ - tANI_U8 llgCoexist; - - /*Coexistence with 11n STA*/ - tANI_U8 ht20Coexist; - - /*Non GF coexist flag*/ - tANI_U8 llnNonGFCoexist; - - /*TXOP protection support*/ - tANI_U8 fLsigTXOPProtectionFullSupport; - - /*RIFS mode*/ - tANI_U8 fRIFSMode; - - /*Beacon Interval in TU*/ - tSirMacBeaconInterval beaconInterval; - - /*DTIM period*/ - tANI_U8 dtimPeriod; - - /*TX Width Set: 0 - 20 MHz only, 1 - 20/40 MHz*/ - tANI_U8 txChannelWidthSet; - - /*Operating channel*/ - tANI_U8 currentOperChannel; - - /*Extension channel for channel bonding*/ - tANI_U8 currentExtChannel; - - /*Reserved to align next field on a dword boundary*/ - tANI_U8 reserved; - - /*SSID of the BSS*/ - tSirMacSSid ssId; - - /*HAL should update the existing BSS entry, if this flag is set. - UMAC will set this flag in case of reassoc, where we want to resue the - the old BSSID and still return success 0 = Add, 1 = Update*/ - tANI_U8 action; - - /* MAC Rate Set */ - tSirMacRateSet rateSet; - - /*Enable/Disable HT capabilities of the BSS*/ - tANI_U8 htCapable; - - // Enable/Disable OBSS protection - tANI_U8 obssProtEnabled; - - /*RMF enabled/disabled*/ - tANI_U8 rmfEnabled; - - /*HT Operating Mode operating mode of the 802.11n STA*/ - tSirMacHTOperatingMode htOperMode; - - /*Dual CTS Protection: 0 - Unused, 1 - Used*/ - tANI_U8 dualCTSProtection; - - /* Probe Response Max retries */ - tANI_U8 ucMaxProbeRespRetryLimit; - - /* To Enable Hidden ssid */ - tANI_U8 bHiddenSSIDEn; - - /* To Enable Disable FW Proxy Probe Resp */ - tANI_U8 bProxyProbeRespEn; - - /* Boolean to indicate if EDCA params are valid. UMAC might not have valid - EDCA params or might not desire to apply EDCA params during config BSS. - 0 implies Not Valid ; Non-Zero implies valid*/ - tANI_U8 edcaParamsValid; - - /*EDCA Parameters for Best Effort Access Category*/ - tSirMacEdcaParamRecord acbe; - - /*EDCA Parameters forBackground Access Category*/ - tSirMacEdcaParamRecord acbk; - - /*EDCA Parameters for Video Access Category*/ - tSirMacEdcaParamRecord acvi; - - /*EDCA Parameters for Voice Access Category*/ - tSirMacEdcaParamRecord acvo; - -#ifdef WLAN_FEATURE_VOWIFI_11R - tANI_U8 extSetStaKeyParamValid; //Ext Bss Config Msg if set - tSetStaKeyParams extSetStaKeyParam; //SetStaKeyParams for ext bss msg -#endif - - /* Persona for the BSS can be STA,AP,GO,CLIENT value same as tHalConMode */ - tANI_U8 halPersona; - - tANI_U8 bSpectrumMgtEnable; - - /*HAL fills in the tx power used for mgmt frames in txMgmtPower*/ - tANI_S8 txMgmtPower; - /*maxTxPower has max power to be used after applying the power constraint if any */ - tANI_S8 maxTxPower; - /*Context of the station being added in HW - Add a STA entry for "itself" - - On AP - Add the AP itself in an "STA context" - On STA - Add the AP to which this STA is joining in an "STA context" */ - tConfigStaParams staContext; -} tConfigBssParams, * tpConfigBssParams; - - -/*-------------------------------------------------------------------------- - * WLAN_HAL_CONFIG_BSS_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* BSSID */ - tSirMacAddr bssId; - - /* Self Mac Address */ - tSirMacAddr selfMacAddr; - - /* BSS type */ - tSirBssType bssType; - - /*Operational Mode: AP =0, STA = 1*/ - tANI_U8 operMode; - - /*Network Type*/ - tSirNwType nwType; - - /*Used to classify PURE_11G/11G_MIXED to program MTU*/ - tANI_U8 shortSlotTimeSupported; - - /*Co-exist with 11a STA*/ - tANI_U8 llaCoexist; - - /*Co-exist with 11b STA*/ - tANI_U8 llbCoexist; - - /*Co-exist with 11g STA*/ - tANI_U8 llgCoexist; - - /*Coexistence with 11n STA*/ - tANI_U8 ht20Coexist; - - /*Non GF coexist flag*/ - tANI_U8 llnNonGFCoexist; - - /*TXOP protection support*/ - tANI_U8 fLsigTXOPProtectionFullSupport; - /*RIFS mode*/ - tANI_U8 fRIFSMode; - - /*Beacon Interval in TU*/ - tSirMacBeaconInterval beaconInterval; - - /*DTIM period*/ - tANI_U8 dtimPeriod; - - /*TX Width Set: 0 - 20 MHz only, 1 - 20/40 MHz*/ - tANI_U8 txChannelWidthSet; - - /*Operating channel*/ - tANI_U8 currentOperChannel; - - /*Extension channel for channel bonding*/ - tANI_U8 currentExtChannel; - - /*Reserved to align next field on a dword boundary*/ - tANI_U8 reserved; - - /*SSID of the BSS*/ - tSirMacSSid ssId; - - /*HAL should update the existing BSS entry, if this flag is set. - UMAC will set this flag in case of reassoc, where we want to resue the - the old BSSID and still return success 0 = Add, 1 = Update*/ - tANI_U8 action; - - /* MAC Rate Set */ - tSirMacRateSet rateSet; - - /*Enable/Disable HT capabilities of the BSS*/ - tANI_U8 htCapable; - - // Enable/Disable OBSS protection - tANI_U8 obssProtEnabled; - - /*RMF enabled/disabled*/ - tANI_U8 rmfEnabled; - - /*HT Operating Mode operating mode of the 802.11n STA*/ - tSirMacHTOperatingMode htOperMode; - - /*Dual CTS Protection: 0 - Unused, 1 - Used*/ - tANI_U8 dualCTSProtection; - - /* Probe Response Max retries */ - tANI_U8 ucMaxProbeRespRetryLimit; - - /* To Enable Hidden ssid */ - tANI_U8 bHiddenSSIDEn; - - /* To Enable Disable FW Proxy Probe Resp */ - tANI_U8 bProxyProbeRespEn; - - /* Boolean to indicate if EDCA params are valid. UMAC might not have valid - EDCA params or might not desire to apply EDCA params during config BSS. - 0 implies Not Valid ; Non-Zero implies valid*/ - tANI_U8 edcaParamsValid; - - /*EDCA Parameters for Best Effort Access Category*/ - tSirMacEdcaParamRecord acbe; - - /*EDCA Parameters forBackground Access Category*/ - tSirMacEdcaParamRecord acbk; - - /*EDCA Parameters for Video Access Category*/ - tSirMacEdcaParamRecord acvi; - - /*EDCA Parameters for Voice Access Category*/ - tSirMacEdcaParamRecord acvo; - -#ifdef WLAN_FEATURE_VOWIFI_11R - tANI_U8 extSetStaKeyParamValid; //Ext Bss Config Msg if set - tSetStaKeyParams extSetStaKeyParam; //SetStaKeyParams for ext bss msg -#endif - - /* Persona for the BSS can be STA,AP,GO,CLIENT value same as tHalConMode */ - tANI_U8 halPersona; - - tANI_U8 bSpectrumMgtEnable; - - /*HAL fills in the tx power used for mgmt frames in txMgmtPower*/ - tANI_S8 txMgmtPower; - /*maxTxPower has max power to be used after applying the power constraint if any */ - tANI_S8 maxTxPower; - /*Context of the station being added in HW - Add a STA entry for "itself" - - On AP - Add the AP itself in an "STA context" - On STA - Add the AP to which this STA is joining in an "STA context" */ - tConfigStaParams_V1 staContext; - - tANI_U8 vhtCapable; - tANI_U8 vhtTxChannelWidthSet; -} tConfigBssParams_V1, * tpConfigBssParams_V1; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - PACKED_PRE union PACKED_POST { - tConfigBssParams configBssParams; - tConfigBssParams_V1 configBssParams_V1; - }uBssParams; -} tConfigBssReqMsg, *tpConfigBssReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_CONFIG_BSS_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Success or Failure */ - tANI_U32 status; - - /* BSS index allocated by HAL */ - tANI_U8 bssIdx; - - /* DPU descriptor index for PTK */ - tANI_U8 dpuDescIndx; - - /* PTK DPU signature */ - tANI_U8 ucastDpuSignature; - - /* DPU descriptor index for GTK*/ - tANI_U8 bcastDpuDescIndx; - - /* GTK DPU signature */ - tANI_U8 bcastDpuSignature; - - /*DPU descriptor for IGTK*/ - tANI_U8 mgmtDpuDescIndx; - - /* IGTK DPU signature */ - tANI_U8 mgmtDpuSignature; - - /* Station Index for BSS entry*/ - tANI_U8 bssStaIdx; - - /* Self station index for this BSS */ - tANI_U8 bssSelfStaIdx; - - /* Bcast station for buffering bcast frames in AP role */ - tANI_U8 bssBcastStaIdx; - - /*MAC Address of STA(PEER/SELF) in staContext of configBSSReq*/ - tSirMacAddr staMac; - - /*HAL fills in the tx power used for mgmt frames in this field. */ - tANI_S8 txMgmtPower; - -} tConfigBssRspParams, * tpConfigBssRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tConfigBssRspParams configBssRspParams; -} tConfigBssRspMsg, *tpConfigBssRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_DELETE_BSS_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* BSS index to be deleted */ - tANI_U8 bssIdx; - -} tDeleteBssParams, *tpDeleteBssParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tDeleteBssParams deleteBssParams; -} tDeleteBssReqMsg, *tpDeleteBssReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_DELETE_BSS_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Success or Failure */ - tANI_U32 status; - - /* BSS index that has been deleted */ - tANI_U8 bssIdx; - -} tDeleteBssRspParams, *tpDeleteBssRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tDeleteBssRspParams deleteBssRspParams; -} tDeleteBssRspMsg, *tpDeleteBssRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_JOIN_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*Indicates the BSSID to which STA is going to associate*/ - tSirMacAddr bssId; - - /*Indicates the channel to switch to.*/ - tANI_U8 ucChannel; - - /* Self STA MAC */ - tSirMacAddr selfStaMacAddr; - - /*Local power constraint*/ - tANI_U8 ucLocalPowerConstraint; - - /*Secondary channel offset */ - ePhyChanBondState secondaryChannelOffset; - - /*link State*/ - tSirLinkState linkState; - - /* Max TX power */ - tANI_S8 maxTxPower; - -} tHalJoinReqParams, *tpHalJoinReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalJoinReqParams joinReqParams; -} tHalJoinReqMsg, *tpHalJoinReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_JOIN_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - - /* HAL fills in the tx power used for mgmt frames in this field */ - tPowerdBm txMgmtPower; - -}tHalJoinRspParams, *tpHalJoinRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalJoinRspParams joinRspParams; -}tHalJoinRspMsg, *tpHalJoinRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_POST_ASSOC_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tConfigStaParams configStaParams; - tConfigBssParams configBssParams; -} tPostAssocReqParams, *tpPostAssocReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tPostAssocReqParams postAssocReqParams; -} tPostAssocReqMsg, *tpPostAssocReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_POST_ASSOC_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tConfigStaRspParams configStaRspParams; - tConfigBssRspParams configBssRspParams; -} tPostAssocRspParams, *tpPostAssocRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tPostAssocRspParams postAssocRspParams; -} tPostAssocRspMsg, *tpPostAssocRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_SET_BSSKEY_REQ ----------------------------------------------------------------------------*/ - -/* - * This is used by PE to create a set of WEP keys for a given BSS. - */ -typedef PACKED_PRE struct PACKED_POST -{ - /*BSS Index of the BSS*/ - tANI_U8 bssIdx; - - /*Encryption Type used with peer*/ - tAniEdType encType; - - /*Number of keys*/ - tANI_U8 numKeys; - - /*Array of keys.*/ - tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS]; - - /*Control for Replay Count, 1= Single TID based replay count on Tx - 0 = Per TID based replay count on TX */ - tANI_U8 singleTidRc; -} tSetBssKeyParams, *tpSetBssKeyParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetBssKeyParams setBssKeyParams; -} tSetBssKeyReqMsg, *tpSetBssKeyReqMsg; - -/* tagged version of set bss key */ -typedef PACKED_PRE struct PACKED_POST -{ - tSetBssKeyReqMsg Msg; - uint32 Tag; -} tSetBssKeyReqMsgTagged; - -/*--------------------------------------------------------------------------- - WLAN_HAL_SET_BSSKEY_RSP ----------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - -} tSetBssKeyRspParams, *tpSetBssKeyRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetBssKeyRspParams setBssKeyRspParams; -} tSetBssKeyRspMsg, *tpSetBssKeyRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_SET_STAKEY_REQ, ----------------------------------------------------------------------------*/ - -/* - * This is used by PE to configure the key information on a given station. - * When the secType is WEP40 or WEP104, the defWEPIdx is used to locate - * a preconfigured key from a BSS the station assoicated with; otherwise - * a new key descriptor is created based on the key field. - */ - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetStaKeyParams setStaKeyParams; -} tSetStaKeyReqMsg, *tpSetStaKeyReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_SET_STAKEY_RSP, ----------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - -} tSetStaKeyRspParams, *tpSetStaKeyRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetStaKeyRspParams setStaKeyRspParams; -} tSetStaKeyRspMsg, *tpSetStaKeyRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_RMV_BSSKEY_REQ, ----------------------------------------------------------------------------*/ -/* - * This is used by PE to remove keys for a given BSS. - */ -typedef PACKED_PRE struct PACKED_POST - -{ - /*BSS Index of the BSS*/ - tANI_U8 bssIdx; - - /*Encryption Type used with peer*/ - tAniEdType encType; - - /*Key Id*/ - tANI_U8 keyId; - - /*STATIC/DYNAMIC. Used in Nullifying in Key Descriptors for Static/Dynamic keys*/ - tAniWepType wepType; - -} tRemoveBssKeyParams, *tpRemoveBssKeyParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tRemoveBssKeyParams removeBssKeyParams; -} tRemoveBssKeyReqMsg, *tpRemoveBssKeyReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_RMV_BSSKEY_RSP, ----------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - -} tRemoveBssKeyRspParams, *tpRemoveBssKeyRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tRemoveBssKeyRspParams removeBssKeyRspParams; -} tRemoveBssKeyRspMsg, *tpRemoveBssKeyRspMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_RMV_STAKEY_REQ, ----------------------------------------------------------------------------*/ -/* - * This is used by PE to Remove the key information on a given station. - */ -typedef PACKED_PRE struct PACKED_POST -{ - /*STA Index*/ - tANI_U16 staIdx; - - /*Encryption Type used with peer*/ - tAniEdType encType; - - /*Key Id*/ - tANI_U8 keyId; - - /*Whether to invalidate the Broadcast key or Unicast key. In case of WEP, - the same key is used for both broadcast and unicast.*/ - tANI_BOOLEAN unicast; - -} tRemoveStaKeyParams, *tpRemoveStaKeyParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tRemoveStaKeyParams removeStaKeyParams; -} tRemoveStaKeyReqMsg, *tpRemoveStaKeyReqMsg; - -/*--------------------------------------------------------------------------- - WLAN_HAL_RMV_STAKEY_RSP, ----------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; -} tRemoveStaKeyRspParams, *tpRemoveStaKeyRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tRemoveStaKeyRspParams removeStaKeyRspParams; -} tRemoveStaKeyRspMsg, *tpRemoveStaKeyRspMsg; - -#ifdef FEATURE_OEM_DATA_SUPPORT - -#ifndef OEM_DATA_REQ_SIZE -#ifdef QCA_WIFI_2_0 -#define OEM_DATA_REQ_SIZE 280 -#else -#define OEM_DATA_REQ_SIZE 134 -#endif -#endif - -#ifndef OEM_DATA_RSP_SIZE -#ifdef QCA_WIFI_2_0 -#define OEM_DATA_RSP_SIZE 1724 -#else -#define OEM_DATA_RSP_SIZE 1968 -#endif -#endif - -/*------------------------------------------------------------------------- -WLAN_HAL_START_OEM_DATA_REQ ---------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 status; - tSirMacAddr selfMacAddr; - tANI_U8 oemDataReq[OEM_DATA_REQ_SIZE]; -} tStartOemDataReqParams, *tpStartOemDataReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tStartOemDataReqParams startOemDataReqParams; -} tStartOemDataReqMsg, *tpStartOemDataReqMsg; - -/*------------------------------------------------------------------------- -WLAN_HAL_START_OEM_DATA_RSP ---------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 oemDataRsp[OEM_DATA_RSP_SIZE]; -} tStartOemDataRspParams, *tpStartOemDataRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tStartOemDataRspParams startOemDataRspParams; -} tStartOemDataRspMsg, *tpStartOemDataRspMsg; - -#endif - - - -/*--------------------------------------------------------------------------- -WLAN_HAL_CH_SWITCH_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Channel number */ - tANI_U8 channelNumber; - - /* Local power constraint */ - tANI_U8 localPowerConstraint; - - /*Secondary channel offset */ - ePhyChanBondState secondaryChannelOffset; - - //HAL fills in the tx power used for mgmt frames in this field. - tPowerdBm txMgmtPower; - - /* Max TX power */ - tPowerdBm maxTxPower; - - /* Self STA MAC */ - tSirMacAddr selfStaMacAddr; - - /*VO WIFI comment: BSSID needed to identify session. As the request has power constraints, - this should be applied only to that session*/ - /* Since MTU timing and EDCA are sessionized, this struct needs to be sessionized and - * bssid needs to be out of the VOWifi feature flag */ - /* V IMP: Keep bssId field at the end of this msg. It is used to mantain backward compatbility - * by way of ignoring if using new host/old FW or old host/new FW since it is at the end of this struct - */ - tSirMacAddr bssId; - -}tSwitchChannelParams, *tpSwitchChannelParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSwitchChannelParams switchChannelParams; -} tSwitchChannelReqMsg, *tpSwitchChannelReqMsg; - -/*--------------------------------------------------------------------------- -WLAN_HAL_CH_SWITCH_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Status */ - tANI_U32 status; - - /* Channel number - same as in request*/ - tANI_U8 channelNumber; - - /* HAL fills in the tx power used for mgmt frames in this field */ - tPowerdBm txMgmtPower; - - /* BSSID needed to identify session - same as in request*/ - tSirMacAddr bssId; - -}tSwitchChannelRspParams, *tpSwitchChannelRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSwitchChannelRspParams switchChannelRspParams; -} tSwitchChannelRspMsg, *tpSwitchChannelRspMsg; - -/*--------------------------------------------------------------------------- -WLAN_HAL_UPD_EDCA_PARAMS_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*BSS Index*/ - tANI_U16 bssIdx; - - /* Best Effort */ - tSirMacEdcaParamRecord acbe; - - /* Background */ - tSirMacEdcaParamRecord acbk; - - /* Video */ - tSirMacEdcaParamRecord acvi; - - /* Voice */ - tSirMacEdcaParamRecord acvo; - -} tEdcaParams, *tpEdcaParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tEdcaParams edcaParams; -} tUpdateEdcaParamsReqMsg, *tpUpdateEdcaParamsReqMsg; - -/*--------------------------------------------------------------------------- -WLAN_HAL_UPD_EDCA_PARAMS_RSP ----------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; -} tEdcaRspParams, *tpEdcaRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tEdcaRspParams edcaRspParams; -} tUpdateEdcaParamsRspMsg, *tpUpdateEdcaParamsRspMsg; - - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_GET_STATS_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST - -{ - /* Index of STA to which the statistics */ - tANI_U16 staIdx; - - /* Encryption mode */ - tANI_U8 encMode; - - /* status */ - tANI_U32 status; - - /* Statistics */ - tANI_U32 sendBlocks; - tANI_U32 recvBlocks; - tANI_U32 replays; - tANI_U8 micErrorCnt; - tANI_U32 protExclCnt; - tANI_U16 formatErrCnt; - tANI_U16 unDecryptableCnt; - tANI_U32 decryptErrCnt; - tANI_U32 decryptOkCnt; -} tDpuStatsParams, * tpDpuStatsParams; - -typedef PACKED_PRE struct PACKED_POST -{ - /* Valid STA Idx for per STA stats request */ - tANI_U32 staId; - - /* Categories of stats requested as specified in eHalStatsMask*/ - tANI_U32 statsMask; -}tHalStatsReqParams, *tpHalStatsReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalStatsReqParams statsReqParams; -} tHalStatsReqMsg, *tpHalStatsReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_GET_STATS_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 retry_cnt[4]; //Total number of packets(per AC) that were successfully transmitted with retries - tANI_U32 multiple_retry_cnt[4]; //The number of MSDU packets and MMPDU frames per AC that the 802.11 - // station successfully transmitted after more than one retransmission attempt - - tANI_U32 tx_frm_cnt[4]; //Total number of packets(per AC) that were successfully transmitted - //(with and without retries, including multi-cast, broadcast) - tANI_U32 rx_frm_cnt; //Total number of packets that were successfully received - //(after appropriate filter rules including multi-cast, broadcast) - tANI_U32 frm_dup_cnt; //Total number of duplicate frames received successfully - tANI_U32 fail_cnt[4]; //Total number packets(per AC) failed to transmit - tANI_U32 rts_fail_cnt; //Total number of RTS/CTS sequence failures for transmission of a packet - tANI_U32 ack_fail_cnt; //Total number packets failed transmit because of no ACK from the remote entity - tANI_U32 rts_succ_cnt; //Total number of RTS/CTS sequence success for transmission of a packet - tANI_U32 rx_discard_cnt; //The sum of the receive error count and dropped-receive-buffer error count. - //HAL will provide this as a sum of (FCS error) + (Fail get BD/PDU in HW) - tANI_U32 rx_error_cnt; //The receive error count. HAL will provide the RxP FCS error global counter. - tANI_U32 tx_byte_cnt; //The sum of the transmit-directed byte count, transmit-multicast byte count - //and transmit-broadcast byte count. HAL will sum TPE UC/MC/BCAST global counters - //to provide this. -}tAniSummaryStatsInfo, *tpAniSummaryStatsInfo; - - -// defines tx_rate_flags -typedef enum eTxRateInfo -{ - eHAL_TX_RATE_LEGACY = 0x1, /* Legacy rates */ - eHAL_TX_RATE_HT20 = 0x2, /* HT20 rates */ - eHAL_TX_RATE_HT40 = 0x4, /* HT40 rates */ - eHAL_TX_RATE_SGI = 0x8, /* Rate with Short guard interval */ - eHAL_TX_RATE_LGI = 0x10, /* Rate with Long guard interval */ - eHAL_TX_RATE_VHT20 = 0x20, /* VHT 20 rates */ - eHAL_TX_RATE_VHT40 = 0x40, /* VHT 20 rates */ - eHAL_TX_RATE_VHT80 = 0x80, /* VHT 20 rates */ - eHAL_TX_RATE_VIRT = 0x100, /* Virtual Rate */ - eHAL_TX_RATE_MAX = WLAN_HAL_MAX_ENUM_SIZE -} tTxrateinfoflags, tTxRateInfoFlags; - - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 rx_frag_cnt; //The number of MPDU frames received by the 802.11 station for MSDU packets - //or MMPDU frames - tANI_U32 promiscuous_rx_frag_cnt; //The number of MPDU frames received by the 802.11 station for MSDU packets - //or MMPDU frames when a promiscuous packet filter was enabled - tANI_U32 rx_input_sensitivity; //The receiver input sensitivity referenced to a FER of 8% at an MPDU length - //of 1024 bytes at the antenna connector. Each element of the array shall correspond - //to a supported rate and the order shall be the same as the supporteRates parameter. - tANI_U32 max_pwr; //The maximum transmit power in dBm upto one decimal. - //for eg: if it is 10.5dBm, the value would be 105 - tANI_U32 sync_fail_cnt; //Number of times the receiver failed to synchronize with the incoming signal - //after detecting the sync in the preamble of the transmitted PLCP protocol data unit. - - tANI_U32 tx_rate; //Legacy transmit rate, in units of 500 kbit/sec, for the most - //recently transmitted frame - tANI_U32 mcs_index; //mcs index for HT20 and HT40 rates - tANI_U32 tx_rate_flags; //to differentiate between HT20 and - //HT40 rates; short and long guard interval -}tAniGlobalClassAStatsInfo, *tpAniGlobalClassAStatsInfo; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 rx_wep_unencrypted_frm_cnt; //The number of unencrypted received MPDU frames that the MAC layer discarded when - //the IEEE 802.11 dot11ExcludeUnencrypted management information base (MIB) object - //is enabled - tANI_U32 rx_mic_fail_cnt; //The number of received MSDU packets that that the 802.11 station discarded - //because of MIC failures - tANI_U32 tkip_icv_err; //The number of encrypted MPDU frames that the 802.11 station failed to decrypt - //because of a TKIP ICV error - tANI_U32 aes_ccmp_format_err; //The number of received MPDU frames that the 802.11 discarded because of an - //invalid AES-CCMP format - tANI_U32 aes_ccmp_replay_cnt; //The number of received MPDU frames that the 802.11 station discarded because of - //the AES-CCMP replay protection procedure - tANI_U32 aes_ccmp_decrpt_err; //The number of received MPDU frames that the 802.11 station discarded because of - //errors detected by the AES-CCMP decryption algorithm - tANI_U32 wep_undecryptable_cnt; //The number of encrypted MPDU frames received for which a WEP decryption key was - //not available on the 802.11 station - tANI_U32 wep_icv_err; //The number of encrypted MPDU frames that the 802.11 station failed to decrypt - //because of a WEP ICV error - tANI_U32 rx_decrypt_succ_cnt; //The number of received encrypted packets that the 802.11 station successfully - //decrypted - tANI_U32 rx_decrypt_fail_cnt; //The number of encrypted packets that the 802.11 station failed to decrypt - -}tAniGlobalSecurityStats, *tpAniGlobalSecurityStats; - -typedef PACKED_PRE struct PACKED_POST -{ - tAniGlobalSecurityStats ucStats; - tAniGlobalSecurityStats mcbcStats; -}tAniGlobalClassBStatsInfo, *tpAniGlobalClassBStatsInfo; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 rx_amsdu_cnt; //This counter shall be incremented for a received A-MSDU frame with the stations - //MAC address in the address 1 field or an A-MSDU frame with a group address in the - //address 1 field - tANI_U32 rx_ampdu_cnt; //This counter shall be incremented when the MAC receives an AMPDU from the PHY - tANI_U32 tx_20_frm_cnt; //This counter shall be incremented when a Frame is transmitted only on the - //primary channel - tANI_U32 rx_20_frm_cnt; //This counter shall be incremented when a Frame is received only on the primary channel - tANI_U32 rx_mpdu_in_ampdu_cnt; //This counter shall be incremented by the number of MPDUs received in the A-MPDU - //when an A-MPDU is received - tANI_U32 ampdu_delimiter_crc_err; //This counter shall be incremented when an MPDU delimiter has a CRC error when this - //is the first CRC error in the received AMPDU or when the previous delimiter has been - //decoded correctly -}tAniGlobalClassCStatsInfo, *tpAniGlobalClassCStatsInfo; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 tx_frag_cnt[4]; //The number of MPDU frames that the 802.11 station transmitted and acknowledged - //through a received 802.11 ACK frame - tANI_U32 tx_ampdu_cnt; //This counter shall be incremented when an A-MPDU is transmitted - tANI_U32 tx_mpdu_in_ampdu_cnt; //This counter shall increment by the number of MPDUs in the AMPDU when an A-MPDU - //is transmitted -}tAniPerStaStatsInfo, *tpAniPerStaStatsInfo; - -typedef PACKED_PRE struct PACKED_POST -{ - /* Success or Failure */ - tANI_U32 status; - - /* STA Idx */ - tANI_U32 staId; - - /* Categories of STATS being returned as per eHalStatsMask*/ - tANI_U32 statsMask; - - /* message type is same as the request type */ - tANI_U16 msgType; - - /* length of the entire request, includes the pStatsBuf length too */ - tANI_U16 msgLen; - -} tHalStatsRspParams, *tpHalStatsRspParams; - - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalStatsRspParams statsRspParams; -} tHalStatsRspMsg, *tpHalStatsRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_SET_LINK_ST_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tSirMacAddr bssid; - tSirLinkState state; - tSirMacAddr selfMacAddr; -} tLinkStateParams, *tpLinkStateParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tLinkStateParams linkStateParams; -} tSetLinkStateReqMsg, *tpSetLinkStateReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_SET_LINK_ST_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; -} tLinkStateRspParams, *tpLinkStateRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tLinkStateRspParams linkStateRspParams; -} tSetLinkStateRspMsg, *tpSetLinkStateRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ADD_TS_REQ - *--------------------------------------------------------------------------*/ - -/* TSPEC Params */ -typedef __ani_attr_pre_packed struct sSirMacTSInfoTfc -{ - tANI_U16 trafficType : 1; - tANI_U16 tsid : 4; - tANI_U16 direction : 2; - tANI_U16 accessPolicy : 2; - tANI_U16 aggregation : 1; - tANI_U16 psb : 1; - tANI_U16 userPrio : 3; - tANI_U16 ackPolicy : 2; -} __ani_attr_packed tSirMacTSInfoTfc; - -/* Flag to schedule the traffic type */ -typedef __ani_attr_pre_packed struct sSirMacTSInfoSch -{ - tANI_U8 schedule : 1; - tANI_U8 rsvd : 7; -} __ani_attr_packed tSirMacTSInfoSch; - -/* Traffic and scheduling info */ -typedef __ani_attr_pre_packed struct sSirMacTSInfo -{ - tSirMacTSInfoTfc traffic; - tSirMacTSInfoSch schedule; -} __ani_attr_packed tSirMacTSInfo; - -/* Information elements */ -typedef __ani_attr_pre_packed struct sSirMacTspecIE -{ - tANI_U8 type; - tANI_U8 length; - tSirMacTSInfo tsinfo; - tANI_U16 nomMsduSz; - tANI_U16 maxMsduSz; - tANI_U32 minSvcInterval; - tANI_U32 maxSvcInterval; - tANI_U32 inactInterval; - tANI_U32 suspendInterval; - tANI_U32 svcStartTime; - tANI_U32 minDataRate; - tANI_U32 meanDataRate; - tANI_U32 peakDataRate; - tANI_U32 maxBurstSz; - tANI_U32 delayBound; - tANI_U32 minPhyRate; - tANI_U16 surplusBw; - tANI_U16 mediumTime; -}__ani_attr_packed tSirMacTspecIE; - -typedef PACKED_PRE struct PACKED_POST -{ - /* Station Index */ - tANI_U16 staIdx; - - /* TSPEC handler uniquely identifying a TSPEC for a STA in a BSS */ - tANI_U16 tspecIdx; - - /* To program TPE with required parameters */ - tSirMacTspecIE tspec; - - /* U-APSD Flags: 1b per AC. Encoded as follows: - b7 b6 b5 b4 b3 b2 b1 b0 = - X X X X BE BK VI VO */ - tANI_U8 uAPSD; - - /* These parameters are for all the access categories */ - tANI_U32 srvInterval[WLAN_HAL_MAX_AC]; // Service Interval - tANI_U32 susInterval[WLAN_HAL_MAX_AC]; // Suspend Interval - tANI_U32 delayInterval[WLAN_HAL_MAX_AC]; // Delay Interval - -} tAddTsParams, *tpAddTsParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tAddTsParams addTsParams; -} tAddTsReqMsg, *tpAddTsReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ADD_TS_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; -} tAddTsRspParams, *tpAddTsRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tAddTsRspParams addTsRspParams; -} tAddTsRspMsg, *tpAddTsRspMsg; - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_DEL_TS_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Station Index */ - tANI_U16 staIdx; - - /* TSPEC identifier uniquely identifying a TSPEC for a STA in a BSS */ - tANI_U16 tspecIdx; - - /* To lookup station id using the mac address */ - tSirMacAddr bssId; - -} tDelTsParams, *tpDelTsParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tDelTsParams delTsParams; -} tDelTsReqMsg, *tpDelTsReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_DEL_TS_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; -} tDelTsRspParams, *tpDelTsRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tDelTsRspParams delTsRspParams; -} tDelTsRspMsg, *tpDelTsRspMsg; - -/* End of TSpec Parameters */ - -/* Start of BLOCK ACK related Parameters */ - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ADD_BA_SESSION_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Station Index */ - tANI_U16 staIdx; - - /* Peer MAC Address */ - tSirMacAddr peerMacAddr; - - /* ADDBA Action Frame dialog token - HAL will not interpret this object */ - tANI_U8 baDialogToken; - - /* TID for which the BA is being setup - This identifies the TC or TS of interest */ - tANI_U8 baTID; - - /* 0 - Delayed BA (Not supported) - 1 - Immediate BA */ - tANI_U8 baPolicy; - - /* Indicates the number of buffers for this TID (baTID) - NOTE - This is the requested buffer size. When this - is processed by HAL and subsequently by HDD, it is - possible that HDD may change this buffer size. Any - change in the buffer size should be noted by PE and - advertized appropriately in the ADDBA response */ - tANI_U16 baBufferSize; - - /* BA timeout in TU's 0 means no timeout will occur */ - tANI_U16 baTimeout; - - /* b0..b3 - Fragment Number - Always set to 0 - b4..b15 - Starting Sequence Number of first MSDU - for which this BA is setup */ - tANI_U16 baSSN; - - /* ADDBA direction - 1 - Originator - 0 - Recipient */ - tANI_U8 baDirection; -} tAddBASessionParams, *tpAddBASessionParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tAddBASessionParams addBASessionParams; -}tAddBASessionReqMsg, *tpAddBASessionReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ADD_BA_SESSION_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - - /* Dialog token */ - tANI_U8 baDialogToken; - - /* TID for which the BA session has been setup */ - tANI_U8 baTID; - - /* BA Buffer Size allocated for the current BA session */ - tANI_U8 baBufferSize; - - tANI_U8 baSessionID; - - /* Reordering Window buffer */ - tANI_U8 winSize; - - /*Station Index to id the sta */ - tANI_U8 STAID; - - /* Starting Sequence Number */ - tANI_U16 SSN; -} tAddBASessionRspParams, *tpAddBASessionRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tAddBASessionRspParams addBASessionRspParams; -} tAddBASessionRspMsg, *tpAddBASessionRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ADD_BA_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Session Id */ - tANI_U8 baSessionID; - - /* Reorder Window Size */ - tANI_U8 winSize; - -#ifdef FEATURE_ON_CHIP_REORDERING - tANI_BOOLEAN isReorderingDoneOnChip; -#endif -} tAddBAParams, *tpAddBAParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tAddBAParams addBAParams; -} tAddBAReqMsg, *tpAddBAReqMsg; - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ADD_BA_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - - /* Dialog token */ - tANI_U8 baDialogToken; - -} tAddBARspParams, *tpAddBARspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tAddBARspParams addBARspParams; -} tAddBARspMsg, *tpAddBARspMsg; - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_TRIGGER_BA_REQ - *--------------------------------------------------------------------------*/ - - -typedef struct sAddBaInfo -{ - tANI_U16 fBaEnable : 1; - tANI_U16 startingSeqNum: 12; - tANI_U16 reserved : 3; -}tAddBaInfo, *tpAddBaInfo; - -typedef struct sTriggerBaRspCandidate -{ - tSirMacAddr staAddr; - tAddBaInfo baInfo[STACFG_MAX_TC]; -}tTriggerBaRspCandidate, *tpTriggerBaRspCandidate; - -typedef struct sTriggerBaCandidate -{ - tANI_U8 staIdx; - tANI_U8 tidBitmap; -}tTriggerBaReqCandidate, *tptTriggerBaReqCandidate; - -typedef PACKED_PRE struct PACKED_POST -{ - /* Session Id */ - tANI_U8 baSessionID; - - /* baCandidateCnt is followed by trigger BA - * Candidate List(tTriggerBaCandidate) - */ - tANI_U16 baCandidateCnt; - -} tTriggerBAParams, *tpTriggerBAParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTriggerBAParams triggerBAParams; -} tTriggerBAReqMsg, *tpTriggerBAReqMsg; - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_TRIGGER_BA_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - - /* TO SUPPORT BT-AMP */ - tSirMacAddr bssId; - - /* success or failure */ - tANI_U32 status; - - /* baCandidateCnt is followed by trigger BA - * Rsp Candidate List(tTriggerRspBaCandidate) - */ - tANI_U16 baCandidateCnt; - - -} tTriggerBARspParams, *tpTriggerBARspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTriggerBARspParams triggerBARspParams; -} tTriggerBARspMsg, *tpTriggerBARspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_DEL_BA_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Station Index */ - tANI_U16 staIdx; - - /* TID for which the BA session is being deleted */ - tANI_U8 baTID; - - /* DELBA direction - 1 - Originator - 0 - Recipient */ - tANI_U8 baDirection; -} tDelBAParams, *tpDelBAParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tDelBAParams delBAParams; -} tDelBAReqMsg, *tpDelBAReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_DEL_BA_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tDelBARspParams, *tpDelBARspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tDelBARspParams delBARspParams; -} tDelBARspMsg, *tpDelBARspMsg; - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_TSM_STATS_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* Traffic Id */ - tANI_U8 tsmTID; - - tSirMacAddr bssId; -} tTsmStatsParams, *tpTsmStatsParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTsmStatsParams tsmStatsParams; -} tTsmStatsReqMsg, *tpTsmStatsReqMsg; - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_TSM_STATS_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - - /* Uplink Packet Queue delay */ - tANI_U16 UplinkPktQueueDly; - - /* Uplink Packet Queue delay histogram */ - tANI_U16 UplinkPktQueueDlyHist[4]; - - /* Uplink Packet Transmit delay */ - tANI_U32 UplinkPktTxDly; - - /* Uplink Packet loss */ - tANI_U16 UplinkPktLoss; - - /* Uplink Packet count */ - tANI_U16 UplinkPktCount; - - /* Roaming count */ - tANI_U8 RoamingCount; - - /* Roaming Delay */ - tANI_U16 RoamingDly; -} tTsmStatsRspParams, *tpTsmStatsRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTsmStatsRspParams tsmStatsRspParams; -} tTsmStatsRspMsg, *tpTsmStatsRspMsg; - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_SET_KEYDONE_MSG - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*bssid of the keys */ - tANI_U8 bssidx; - tANI_U8 encType; -} tSetKeyDoneParams, *tpSetKeyDoneParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetKeyDoneParams setKeyDoneParams; -} tSetKeyDoneMsg, *tpSetKeyDoneMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_DOWNLOAD_NV_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* Fragment sequence number of the NV Image. Note that NV Image might not - * fit into one message due to size limitation of the SMD channel FIFO. UMAC - * can hence choose to chop the NV blob into multiple fragments starting with - * seqeunce number 0, 1, 2 etc. The last fragment MUST be indicated by - * marking the isLastFragment field to 1. Note that all the NV blobs would be - * concatenated together by HAL without any padding bytes in between.*/ - tANI_U16 fragNumber; - - /* Is this the last fragment? When set to 1 it indicates that no more fragments - * will be sent by UMAC and HAL can concatenate all the NV blobs rcvd & proceed - * with the parsing. HAL would generate a WLAN_HAL_DOWNLOAD_NV_RSP to the - * WLAN_HAL_DOWNLOAD_NV_REQ after it receives each fragment */ - tANI_U16 isLastFragment; - - /* NV Image size (number of bytes) */ - tANI_U32 nvImgBufferSize; - - /* Following the 'nvImageBufferSize', there should be nvImageBufferSize - * bytes of NV Image i.e. uint8[nvImageBufferSize] */ -} tHalNvImgDownloadReqParams, *tpHalNvImgDownloadReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - /* Note: The length specified in tHalNvImgDownloadReqMsg messages should be - * header.msgLen = sizeof(tHalNvImgDownloadReqMsg) + nvImgBufferSize */ - tHalMsgHeader header; - tHalNvImgDownloadReqParams nvImageReqParams; -} tHalNvImgDownloadReqMsg, *tpHalNvImgDownloadReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_DOWNLOAD_NV_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* Success or Failure. HAL would generate a WLAN_HAL_DOWNLOAD_NV_RSP - * after each fragment */ - tANI_U32 status; -} tHalNvImgDownloadRspParams, *tpHalNvImgDownloadRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalNvImgDownloadRspParams nvImageRspParams; -} tHalNvImgDownloadRspMsg, *tpHalNvImgDownloadRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_STORE_NV_IND - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* NV Item */ - eNvTable tableID; - - /* Size of NV Blob */ - tANI_U32 nvBlobSize; - - /* Following the 'nvBlobSize', there should be nvBlobSize bytes of - * NV blob i.e. uint8[nvBlobSize] */ -} tHalNvStoreParams, *tpHalNvStoreParams; - -typedef PACKED_PRE struct PACKED_POST -{ - /* Note: The length specified in tHalNvStoreInd messages should be - * header.msgLen = sizeof(tHalNvStoreInd) + nvBlobSize */ - tHalMsgHeader header; - tHalNvStoreParams nvStoreParams; -} tHalNvStoreInd, *tpHalNvStoreInd; - -/* End of Block Ack Related Parameters */ - -/*--------------------------------------------------------------------------- - * WLAN_HAL_MIC_FAILURE_IND - *--------------------------------------------------------------------------*/ - -#define SIR_CIPHER_SEQ_CTR_SIZE 6 - -typedef PACKED_PRE struct PACKED_POST -{ - tSirMacAddr srcMacAddr; //address used to compute MIC - tSirMacAddr taMacAddr; //transmitter address - tSirMacAddr dstMacAddr; - tANI_U8 multicast; - tANI_U8 IV1; // first byte of IV - tANI_U8 keyId; // second byte of IV - tANI_U8 TSC[SIR_CIPHER_SEQ_CTR_SIZE]; // sequence number - tSirMacAddr rxMacAddr; // receive address -} tSirMicFailureInfo, *tpSirMicFailureInfo; - -/* Definition for MIC failure indication - MAC reports this each time a MIC failure occures on Rx TKIP packet - */ -typedef PACKED_PRE struct PACKED_POST -{ - tSirMacAddr bssId; // BSSID - tSirMicFailureInfo info; -} tSirMicFailureInd, *tpSirMicFailureInd; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSirMicFailureInd micFailureInd; -} tMicFailureIndMsg, *tpMicFailureIndMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U16 opMode; - tANI_U16 staId; -}tUpdateVHTOpMode, *tpUpdateVHTOpMode; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tUpdateVHTOpMode updateVhtOpMode; -} tUpdateVhtOpModeReqMsg, *tpUpdateVhtOpModeReqMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 status; -} tUpdateVhtOpModeParamsRsp, *tpUpdateVhtOpModeParamsRsp; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tUpdateVhtOpModeParamsRsp updateVhtOpModeRspParam; -} tUpdateVhtOpModeParamsRspMsg, *tpUpdateVhtOpModeParamsRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_UPDATE_BEACON_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - - tANI_U8 bssIdx; - - //shortPreamble mode. HAL should update all the STA rates when it - //receives this message - tANI_U8 fShortPreamble; - //short Slot time. - tANI_U8 fShortSlotTime; - //Beacon Interval - tANI_U16 beaconInterval; - //Protection related - tANI_U8 llaCoexist; - tANI_U8 llbCoexist; - tANI_U8 llgCoexist; - tANI_U8 ht20MhzCoexist; - tANI_U8 llnNonGFCoexist; - tANI_U8 fLsigTXOPProtectionFullSupport; - tANI_U8 fRIFSMode; - - tANI_U16 paramChangeBitmap; -}tUpdateBeaconParams, *tpUpdateBeaconParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tUpdateBeaconParams updateBeaconParam; -} tUpdateBeaconReqMsg, *tpUpdateBeaconReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_UPDATE_BEACON_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 status; -} tUpdateBeaconRspParams, *tpUpdateBeaconRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tUpdateBeaconRspParams updateBeaconRspParam; -} tUpdateBeaconRspMsg, *tpUpdateBeaconRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_SEND_BEACON_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 beaconLength; //length of the template. - tANI_U8 beacon[BEACON_TEMPLATE_SIZE]; // Beacon data. - tSirMacAddr bssId; - tANI_U32 timIeOffset; //TIM IE offset from the beginning of the template. - tANI_U16 p2pIeOffset; //P2P IE offset from the begining of the template -}tSendBeaconParams, *tpSendBeaconParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSendBeaconParams sendBeaconParam; -}tSendBeaconReqMsg, *tpSendBeaconReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_SEND_BEACON_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 status; -} tSendBeaconRspParams, *tpSendBeaconRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSendBeaconRspParams sendBeaconRspParam; -} tSendBeaconRspMsg, *tpSendBeaconRspMsg; - -#ifdef FEATURE_5GHZ_BAND - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ENABLE_RADAR_DETECT_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tSirMacAddr BSSID; - tANI_U8 channel; -}tSirEnableRadarInfoType, *tptSirEnableRadarInfoType; - - -typedef PACKED_PRE struct PACKED_POST -{ - /* Link Parameters */ - tSirEnableRadarInfoType EnableRadarInfo; -}tEnableRadarReqParams, *tpEnableRadarReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tEnableRadarReqParams enableRadarReqParams; -}tEnableRadarReqMsg, *tpEnableRadarReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ENABLE_RADAR_DETECT_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Link Parameters */ - tSirMacAddr BSSID; - /* success or failure */ - tANI_U32 status; -}tEnableRadarRspParams, *tpEnableRadarRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tEnableRadarRspParams enableRadarRspParams; -}tEnableRadarRspMsg, *tpEnableRadarRspMsg; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_RADAR_DETECT_INTR_IND - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 radarDetChannel; -}tRadarDetectIntrIndParams, *tpRadarDetectIntrIndParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tRadarDetectIntrIndParams radarDetectIntrIndParams; -}tRadarDetectIntrIndMsg, *tptRadarDetectIntrIndMsg; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_RADAR_DETECT_IND - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*channel number in which the RADAR detected*/ - tANI_U8 channelNumber; - - /*RADAR pulse width*/ - tANI_U16 radarPulseWidth; // in usecond - - /*Number of RADAR pulses */ - tANI_U16 numRadarPulse; -}tRadarDetectIndParams,*tpRadarDetectIndParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tRadarDetectIndParams radarDetectIndParams; -}tRadarDetectIndMsg, *tptRadarDetectIndMsg; - - -/*--------------------------------------------------------------------------- - *WLAN_HAL_GET_TPC_REPORT_REQ - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tSirMacAddr sta; - tANI_U8 dialogToken; - tANI_U8 txpower; -}tSirGetTpcReportReqParams, *tpSirGetTpcReportReqParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSirGetTpcReportReqParams getTpcReportReqParams; -}tSirGetTpcReportReqMsg, *tpSirGetTpcReportReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_GET_TPC_REPORT_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -}tSirGetTpcReportRspParams, *tpSirGetTpcReportRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSirGetTpcReportRspParams getTpcReportRspParams; -}tSirGetTpcReportRspMsg, *tpSirGetTpcReportRspMsg; - -#endif - -/*--------------------------------------------------------------------------- - *WLAN_HAL_UPDATE_PROBE_RSP_TEMPLATE_REQ - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 pProbeRespTemplate[BEACON_TEMPLATE_SIZE]; - tANI_U32 probeRespTemplateLen; - tANI_U32 ucProxyProbeReqValidIEBmap[8]; - tSirMacAddr bssId; - -}tSendProbeRespReqParams, *tpSendProbeRespReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSendProbeRespReqParams sendProbeRespReqParams ; -}tSendProbeRespReqMsg, *tpSendProbeRespReqMsg; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_UPDATE_PROBE_RSP_TEMPLATE_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -}tSendProbeRespRspParams, *tpSendProbeRespRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSendProbeRespRspParams sendProbeRespRspParams; -}tSendProbeRespRspMsg, *tpSendProbeRespRspMsg; - - -/*--------------------------------------------------------------------------- - *WLAN_HAL_UNKNOWN_ADDR2_FRAME_RX_IND - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -}tSendUnkownFrameRxIndParams, *tpSendUnkownFrameRxIndParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSendUnkownFrameRxIndParams sendUnkownFrameRxIndParams; -}tSendUnkownFrameRxIndMsg, *tpSendUnkownFrameRxIndMsg; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_DELETE_STA_CONTEXT_IND - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U16 assocId; - tANI_U16 staId; - tSirMacAddr bssId; // TO SUPPORT BT-AMP - // HAL copies bssid from the sta table. - tSirMacAddr addr2; // - tANI_U16 reasonCode; // To unify the keepalive / unknown A2 / tim-based disa - -}tDeleteStaContextParams, *tpDeleteStaContextParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tDeleteStaContextParams deleteStaContextParams; -}tDeleteStaContextIndMsg, *tpDeleteStaContextIndMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tANI_U8 assocId; - tANI_U8 staIdx; - tANI_U8 bssIdx; - tANI_U8 uReasonCode; - tANI_U32 uStatus; -} tIndicateDelSta, *tpIndicateDelSta; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_SIGNAL_BTAMP_EVENT_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tBtAmpEventType btAmpEventType; - -}tBtAmpEventParams, *tpBtAmpEventParams; - - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tBtAmpEventParams btAmpEventParams; -}tBtAmpEventMsg, *tpBtAmpEventMsg; - -/*--------------------------------------------------------------------------- -*WLAN_HAL_SIGNAL_BTAMP_EVENT_RSP -*--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -}tBtAmpEventRspParams, *tpBtAmpEventRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tBtAmpEventRspParams btAmpEventRspParams; -}tBtAmpEventRsp, *tpBtAmpEventRsp; - - -/*--------------------------------------------------------------------------- - *WLAN_HAL_TL_HAL_FLUSH_AC_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - // Station Index. originates from HAL - tANI_U8 ucSTAId; - - // TID for which the transmit queue is being flushed - tANI_U8 ucTid; - -}tTlHalFlushAcParams, *tpTlHalFlushAcParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTlHalFlushAcParams tlHalFlushAcParam; -}tTlHalFlushAcReq, *tpTlHalFlushAcReq; - -/*--------------------------------------------------------------------------- -*WLAN_HAL_TL_HAL_FLUSH_AC_RSP -*--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - // Station Index. originates from HAL - tANI_U8 ucSTAId; - - // TID for which the transmit queue is being flushed - tANI_U8 ucTid; - - /* success or failure */ - tANI_U32 status; -}tTlHalFlushAcRspParams, *tpTlHalFlushAcRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTlHalFlushAcRspParams tlHalFlushAcRspParam; -}tTlHalFlushAcRspMsg, *tpTlHalFlushAcRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ENTER_IMPS_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; -} tHalEnterImpsReqMsg, *tpHalEnterImpsReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_EXIT_IMPS_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; -} tHalExitImpsReqMsg, *tpHalExitImpsReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ENTER_BMPS_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 bssIdx; - //TBTT value derived from the last beacon -#ifndef BUILD_QWPTTSTATIC - tANI_U64 tbtt; -#endif - tANI_U8 dtimCount; - //DTIM period given to HAL during association may not be valid, - //if association is based on ProbeRsp instead of beacon. - tANI_U8 dtimPeriod; - - // For ESE and 11R Roaming - tANI_U32 rssiFilterPeriod; - tANI_U32 numBeaconPerRssiAverage; - tANI_U8 bRssiFilterEnable; - -} tHalEnterBmpsReqParams, *tpHalEnterBmpsReqParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalEnterBmpsReqParams enterBmpsReq; -} tHalEnterBmpsReqMsg, *tpHalEnterBmpsReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_EXIT_BMPS_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 sendDataNull; - tANI_U8 bssIdx; -} tHalExitBmpsReqParams, *tpHalExitBmpsReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalExitBmpsReqParams exitBmpsReqParams; -} tHalExitBmpsReqMsg, *tpHalExitBmpsReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_MISSED_BEACON_IND - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 bssIdx; -} tHalMissedBeaconIndParams, *tpHalMissedBeaconIndParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalMissedBeaconIndParams missedBeaconIndParams; -} tHalMissedBeaconIndMsg, *tpHalMissedBeaconIndMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ADD_BCN_FILTER_REQ - *--------------------------------------------------------------------------*/ -/* Beacon Filtering data structures */ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 offset; - tANI_U8 value; - tANI_U8 bitMask; - tANI_U8 ref; -} tEidByteInfo, *tpEidByteInfo; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U16 capabilityInfo; - tANI_U16 capabilityMask; - tANI_U16 beaconInterval; - tANI_U16 ieNum; - tANI_U8 bssIdx; - tANI_U8 reserved; -} tBeaconFilterMsg, *tpBeaconFilterMsg; - -/* The above structure would be followed by multiple of below mentioned structure */ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 elementId; - tANI_U8 checkIePresence; - tEidByteInfo byte; -} tBeaconFilterIe, *tpBeaconFilterIe; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tBeaconFilterMsg addBcnFilterParams; -} tHalAddBcnFilterReqMsg, *tpHalAddBcnFilterReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_REM_BCN_FILTER_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 ucIeCount; - tANI_U8 ucRemIeId[1]; -} tRemBeaconFilterMsg, *tpRemBeaconFilterMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tRemBeaconFilterMsg remBcnFilterParams; -} tHalRemBcnFilterReqMsg, *tpHalRemBcnFilterReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_HOST_OFFLOAD_REQ - *--------------------------------------------------------------------------*/ -#define HAL_IPV4_ARP_REPLY_OFFLOAD 0 -#define HAL_IPV6_NEIGHBOR_DISCOVERY_OFFLOAD 1 -#define HAL_IPV6_NS_OFFLOAD 2 -#define HAL_IPV6_ADDR_LEN 16 -#define HAL_MAC_ADDR_LEN 6 -#define HAL_OFFLOAD_DISABLE 0 -#define HAL_OFFLOAD_ENABLE 1 -#define HAL_OFFLOAD_BCAST_FILTER_ENABLE 0x2 -#define HAL_OFFLOAD_MCAST_FILTER_ENABLE 0x4 -#define HAL_OFFLOAD_ARP_AND_BCAST_FILTER_ENABLE (HAL_OFFLOAD_ENABLE|HAL_OFFLOAD_BCAST_FILTER_ENABLE) -#define HAL_OFFLOAD_IPV6NS_AND_MCAST_FILTER_ENABLE (HAL_OFFLOAD_ENABLE|HAL_OFFLOAD_MCAST_FILTER_ENABLE) - -typedef PACKED_PRE struct PACKED_POST _tHalNSOffloadParams -{ - tANI_U8 srcIPv6Addr[HAL_IPV6_ADDR_LEN]; - tANI_U8 selfIPv6Addr[HAL_IPV6_ADDR_LEN]; - //Only support 2 possible Network Advertisement IPv6 address - tANI_U8 targetIPv6Addr1[HAL_IPV6_ADDR_LEN]; - tANI_U8 targetIPv6Addr2[HAL_IPV6_ADDR_LEN]; - tANI_U8 selfMacAddr[HAL_MAC_ADDR_LEN]; - tANI_U8 srcIPv6AddrValid : 1; - tANI_U8 targetIPv6Addr1Valid : 1; - tANI_U8 targetIPv6Addr2Valid : 1; - tANI_U8 reserved1 : 5; - tANI_U8 reserved2; //make it DWORD aligned - tANI_U8 bssIdx; - tANI_U32 slotIndex; // slot index for this offload -} tHalNSOffloadParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 offloadType; - tANI_U8 enableOrDisable; - PACKED_PRE union PACKED_POST - { - tANI_U8 hostIpv4Addr [4]; - tANI_U8 hostIpv6Addr [HAL_IPV6_ADDR_LEN]; - } params; -} tHalHostOffloadReq, *tpHalHostOffloadReq; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalHostOffloadReq hostOffloadParams; - tHalNSOffloadParams nsOffloadParams; -} tHalHostOffloadReqMsg, *tpHalHostOffloadReqMsg; - - -#ifdef FEATURE_WLAN_LPHB -typedef enum -{ - WIFI_HB_SET_ENABLE = 0x0001, - WIFI_HB_SET_TCP_PARAMS = 0x0002, - WIFI_HB_SET_TCP_PKT_FILTER = 0x0003, - WIFI_HB_SET_UDP_PARAMS = 0x0004, - WIFI_HB_SET_UDP_PKT_FILTER = 0x0005, - WIFI_HB_SET_NETWORK_INFO = 0x0006, -}tLowPowerHeartBeatCmdType ; - -#define MAX_FLITER_SIZE 64 -/*--------------------------------------------------------------------------- - *FEATURE_WLAN_LPHB REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - uint32 hostIpv4Addr; - uint32 destIpv4Addr; - uint16 hostPort; - uint16 destPort; - uint16 timeOutSec; // in seconds - tSirMacAddr gatewayMacAddr; - uint16 timePeriodSec; // in seconds - uint32 tcpSn; -} tlowPowerHeartBeatParamsTcpStruct; - -typedef PACKED_PRE struct PACKED_POST -{ - uint32 hostIpv4Addr; - uint32 destIpv4Addr; - uint16 hostPort; - uint16 destPort; - uint16 timePeriodSec;// in seconds - uint16 timeOutSec; // in seconds - tSirMacAddr gatewayMacAddr; -} tlowPowerHeartBeatParamsUdpStruct; - -typedef PACKED_PRE struct PACKED_POST -{ - uint32 offset; - uint32 filterLength; - uint8 filter[MAX_FLITER_SIZE]; -} tlowPowerHeartBeatFilterStruct; - -typedef PACKED_PRE struct PACKED_POST -{ - uint8 heartBeatEnable; - uint8 heartBeatType; //TCP or UDP -} tlowPowerHeartBeatEnableStruct; - -typedef PACKED_PRE struct PACKED_POST -{ - uint8 dummy; -} tlowPowerHeartBeatNetworkInfoStruct; - - -typedef PACKED_PRE struct PACKED_POST -{ - uint8 sessionIdx; - uint16 lowPowerHeartBeatCmdType; - PACKED_PRE union PACKED_PRO - { - tlowPowerHeartBeatEnableStruct control; - tlowPowerHeartBeatFilterStruct tcpUdpFilter; - tlowPowerHeartBeatParamsTcpStruct tcpParams; - tlowPowerHeartBeatParamsUdpStruct udpParams; - tlowPowerHeartBeatNetworkInfoStruct info; - }options; -} tHalLowPowerHeartBeatReq, *tpHalLowPowerHeartBeatReq; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalLowPowerHeartBeatReq lowPowerHeartBeatParams; -} tHalLowPowerHeartBeatReqMsg, *tpHalLowPowerHeartBeatReqMsg; - -/*--------------------------------------------------------------------------- - * FEATURE_WLAN_LPHB RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - uint8 sessionIdx; - uint32 status; - uint16 lowPowerHeartBeatCmdType; -}tHalLowPowerHeartBeatRspParams, *tpHalLowPowerHeartBeatRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalLowPowerHeartBeatRspParams lowPowerHeartBeatRspParams; -}tHalLowPowerHeartBeatRspMsg, *tpHalLowPowerHeartBeatRspMsg; - - -/*--------------------------------------------------------------------------- - * FEATURE_WLAN_LPHB IND - *--------------------------------------------------------------------------*/ -#define WIFI_HB_EVENT_TCP_RX_TIMEOUT 0x0001 -#define WIFI_HB_EVENT_UDP_RX_TIMEOUT 0x0002 - -#define WIFI_LPHB_EVENT_REASON_TIMEOUT 0x01 -#define WIFI_LPHB_EVENT_REASON_FW_ON_MONITOR 0x02 -#define WIFI_LPHB_EVENT_REASON_FW_OFF_MONITOR 0x03 - - -#define WIFI_LPHB_PROTO_UDP 0x01 -#define WIFI_LPHB_PROTO_TCP 0x02 - -typedef PACKED_PRE struct PACKED_POST -{ - uint8 bssIdx; - uint8 sessionIdx; - uint8 protocolType; /*TCP or UDP*/ - uint8 eventReason; - -}tHalLowPowerHeartBeatIndParam,*tpHalLowPowerHeartBeatIndParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalLowPowerHeartBeatIndParam lowPowerHeartBeatIndParams; -}tHalLowPowerHeartBeatIndMsg, *tpHalLowPowerHeartBeatIndMsg; - -#endif - -#ifdef FEATURE_WLAN_BATCH_SCAN - -/*--------------------------------------------------------------------------- - * WLAN_HAL_BATCHSCAN_SET_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* Scan Frerquency - default to 30Sec*/ - tANI_U32 scanInterval; - tANI_U32 numScan2Batch; - tANI_U32 bestNetworks; - tANI_U8 rfBand; - tANI_U8 rtt; -} tHalBatchScanSetParams, *tpHalBatchScanSetParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalBatchScanSetParams batchScanParams; -} tHalBatchScanSetReqMsg, *tpHalBatchScanSetReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_BATCHSCAN_SET_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 supportedMscan; -} tHalBatchScanSetRspParam, *tpHalBatchScanSetRspParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalBatchScanSetRspParam setBatchScanRspParam; -} tHalBatchScanSetRspMsg, *tpHalBatchScanSetRspMsg; - -/*--------------------------------------------------------------------------- -* WLAN_HAL_BATCHSCAN_STOP_IND -*--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 param; -} tHalBatchScanStopIndParam, *tpHalBatchScanStopIndParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalBatchScanStopIndParam param; -} tHalBatchScanStopIndMsg, *tpHalBatchScanStopIndMsg; - -/*--------------------------------------------------------------------------- -* WLAN_HAL_BATCHSCAN_TRIGGER_RESULT_IND -*--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 param; -} tHalBatchScanTriggerResultParam, *tpHalBatchScanTriggerResultParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalBatchScanTriggerResultParam param; -} tHalBatchScanTriggerResultIndMsg, *tpHalBatchScanTriggerResultIndMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_BATCHSCAN_GET_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 bssid[6]; /* BSSID */ - tANI_U8 ssid[32]; /* SSID */ - tANI_U8 ch; /* Channel */ - tANI_U8 rssi; /* RSSI or Level */ - /* Timestamp when Network was found. Used to calculate age based on timestamp in GET_RSP msg header */ - tANI_U32 timestamp; -} tHalBatchScanNetworkInfo, *tpHalBatchScanNetworkInfo; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 scanId; /* Scan List ID. */ - /* No of AP in a Scan Result. Should be same as bestNetwork in SET_REQ msg */ - tANI_U32 numNetworksInScanList; - /* Variable data ptr: Number of AP in Scan List */ - /* following numNetworkInScanList is data of type tHalBatchScanNetworkInfo - * of sizeof(tHalBatchScanNetworkInfo) * numNetworkInScanList */ - tANI_U8 scanList[1]; -} tHalBatchScanList, *tpHalBatchScanList; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 timestamp; - tANI_U32 numScanLists; - boolean isLastResult; - /* Variable Data ptr: Number of Scan Lists*/ - /* following isLastResult is data of type tHalBatchScanList - * of sizeof(tHalBatchScanList) * numScanLists*/ - tANI_U8 scanResults[1]; -} tHalBatchScanResultIndParam, *tpHalBatchScanResultIndParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalBatchScanResultIndParam resultIndMsgParam; -} tHalBatchScanResultIndMsg, *tpHalBatchScanResultIndMsg; - -#endif - -/*--------------------------------------------------------------------------- - * WLAN_HAL_KEEP_ALIVE_REQ - *--------------------------------------------------------------------------*/ -/* Packet Types. */ -#define HAL_KEEP_ALIVE_NULL_PKT 1 -#define HAL_KEEP_ALIVE_UNSOLICIT_ARP_RSP 2 - -/* Enable or disable keep alive */ -#define HAL_KEEP_ALIVE_DISABLE 0 -#define HAL_KEEP_ALIVE_ENABLE 1 - -/* Keep Alive request. */ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 packetType; - tANI_U32 timePeriod; - tHalIpv4Addr hostIpv4Addr; - tHalIpv4Addr destIpv4Addr; - tSirMacAddr destMacAddr; - tANI_U8 bssIdx; -} tHalKeepAliveReq, *tpHalKeepAliveReq; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalKeepAliveReq KeepAliveParams; -} tHalKeepAliveReqMsg, *tpHalKeepAliveReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_SET_RSSI_THRESH_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_S8 ucRssiThreshold1 : 8; - tANI_S8 ucRssiThreshold2 : 8; - tANI_S8 ucRssiThreshold3 : 8; - tANI_U8 bRssiThres1PosNotify : 1; - tANI_U8 bRssiThres1NegNotify : 1; - tANI_U8 bRssiThres2PosNotify : 1; - tANI_U8 bRssiThres2NegNotify : 1; - tANI_U8 bRssiThres3PosNotify : 1; - tANI_U8 bRssiThres3NegNotify : 1; - tANI_U8 bReserved10 : 2; -} tHalRSSIThresholds, *tpHalRSSIThresholds; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRSSIThresholds rssiThreshParams; -} tHalRSSIThresholdReqMsg, *tpHalRSSIThresholdReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ENTER_UAPSD_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 bkDeliveryEnabled:1; - tANI_U8 beDeliveryEnabled:1; - tANI_U8 viDeliveryEnabled:1; - tANI_U8 voDeliveryEnabled:1; - tANI_U8 bkTriggerEnabled:1; - tANI_U8 beTriggerEnabled:1; - tANI_U8 viTriggerEnabled:1; - tANI_U8 voTriggerEnabled:1; - tANI_U8 bssIdx; -} tUapsdReqParams, *tpUapsdReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tUapsdReqParams enterUapsdParams; -} tHalEnterUapsdReqMsg, *tpHalEnterUapsdReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_EXIT_UAPSD_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tANI_U8 bssIdx; -} tHalExitUapsdReqMsg, *tpHalExitUapsdReqMsg; - -#define HAL_PERIODIC_TX_PTRN_MAX_SIZE 1536 -#define HAL_MAXNUM_PERIODIC_TX_PTRNS 6 -/*--------------------------------------------------------------------------- - * WLAN_HAL_ADD_PERIODIC_TX_PTRN_IND - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 selfStaIdx:8; - tANI_U32 ucPtrnId:8; // Pattern ID - tANI_U32 usPtrnSize:16; // Non-Zero Pattern size - tANI_U32 uPtrnIntervalMs; // In msec - tANI_U8 ucPattern[HAL_PERIODIC_TX_PTRN_MAX_SIZE]; // Pattern buffer -} tHalAddPeriodicTxPtrn, *tpHalAddPeriodicTxPtrn; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalAddPeriodicTxPtrn ptrnParams; -} tHalAddPeriodicTxPtrnIndMsg, *tpHalAddPeriodicTxPtrnIndMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_DEL_PERIODIC_TX_PTRN_IND - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 selfStaIdx:8; - tANI_U32 rsvd:24; - /* Bitmap of pattern IDs that needs to be deleted */ - tANI_U32 uPatternIdBitmap; -} tHalDelPeriodicTxPtrn, *tpHalDelPeriodicTxPtrn; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalDelPeriodicTxPtrn ptrnParams; -} tHalDelPeriodicTxPtrnIndMsg, *tpHalDelPeriodicTxPtrnIndMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_PERIODIC_TX_PTRN_FW_IND - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* Type of Failure indication */ - tANI_U32 bssIdx:8; - tANI_U32 selfStaIdx:8; - tANI_U32 rsvd:16; - tANI_U32 status; - tANI_U32 patternIdBitmap; -} tHalPeriodicTxPtrnFwInd, *tpHalPeriodicTxPtrnFwInd; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalPeriodicTxPtrnFwInd fwIndParams; -} tHalPeriodicTxPtrnFwIndMsg, *tpHalPeriodicTxPtrnFwIndMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ADD_WOWL_BCAST_PTRN - *--------------------------------------------------------------------------*/ -#define HAL_WOWL_BCAST_PATTERN_MAX_SIZE 128 -#define HAL_WOWL_BCAST_MAX_NUM_PATTERNS 16 - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 ucPatternId; // Pattern ID - // Pattern byte offset from beginning of the 802.11 packet to start of the - // wake-up pattern - tANI_U8 ucPatternByteOffset; - tANI_U8 ucPatternSize; // Non-Zero Pattern size - tANI_U8 ucPattern[HAL_WOWL_BCAST_PATTERN_MAX_SIZE]; // Pattern - tANI_U8 ucPatternMaskSize; // Non-zero pattern mask size - tANI_U8 ucPatternMask[HAL_WOWL_BCAST_PATTERN_MAX_SIZE]; // Pattern mask - tANI_U8 ucPatternExt[HAL_WOWL_BCAST_PATTERN_MAX_SIZE]; // Extra pattern - tANI_U8 ucPatternMaskExt[HAL_WOWL_BCAST_PATTERN_MAX_SIZE]; // Extra pattern mask - tANI_U8 bssIdx; -} tHalWowlAddBcastPtrn, *tpHalWowlAddBcastPtrn; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalWowlAddBcastPtrn ptrnParams; -} tHalWowlAddBcastPtrnReqMsg, *tpHalWowlAddBcastPtrnReqMsg; - - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_DEL_WOWL_BCAST_PTRN - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* Pattern ID of the wakeup pattern to be deleted */ - tANI_U8 ucPatternId; - tANI_U8 bssIdx; -} tHalWowlDelBcastPtrn, *tpHalWowlDelBcastPtrn; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalWowlDelBcastPtrn ptrnParams; -} tHalWowlDelBcastPtrnReqMsg, *tpHalWowlDelBcastPtrnReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ENTER_WOWL_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* Enables/disables magic packet filtering */ - tANI_U8 ucMagicPktEnable; - - /* Magic pattern */ - tSirMacAddr magicPtrn; - - /* Enables/disables packet pattern filtering in firmware. - Enabling this flag enables broadcast pattern matching - in Firmware. If unicast pattern matching is also desired, - ucUcastPatternFilteringEnable flag must be set tot true - as well - */ - tANI_U8 ucPatternFilteringEnable; - - /* Enables/disables unicast packet pattern filtering. - This flag specifies whether we want to do pattern match - on unicast packets as well and not just broadcast packets. - This flag has no effect if the ucPatternFilteringEnable - (main controlling flag) is set to false - */ - tANI_U8 ucUcastPatternFilteringEnable; - - /* This configuration is valid only when magicPktEnable=1. - * It requests hardware to wake up when it receives the - * Channel Switch Action Frame. - */ - tANI_U8 ucWowChnlSwitchRcv; - - /* This configuration is valid only when magicPktEnable=1. - * It requests hardware to wake up when it receives the - * Deauthentication Frame. - */ - tANI_U8 ucWowDeauthRcv; - - /* This configuration is valid only when magicPktEnable=1. - * It requests hardware to wake up when it receives the - * Disassociation Frame. - */ - tANI_U8 ucWowDisassocRcv; - - /* This configuration is valid only when magicPktEnable=1. - * It requests hardware to wake up when it has missed - * consecutive beacons. This is a hardware register - * configuration (NOT a firmware configuration). - */ - tANI_U8 ucWowMaxMissedBeacons; - - /* This configuration is valid only when magicPktEnable=1. - * This is a timeout value in units of microsec. It requests - * hardware to unconditionally wake up after it has stayed - * in WoWLAN mode for some time. Set 0 to disable this feature. - */ - tANI_U8 ucWowMaxSleepUsec; - - /* This configuration directs the WoW packet filtering to look for EAP-ID - * requests embedded in EAPOL frames and use this as a wake source. - */ - tANI_U8 ucWoWEAPIDRequestEnable; - - /* This configuration directs the WoW packet filtering to look for EAPOL-4WAY - * requests and use this as a wake source. - */ - tANI_U8 ucWoWEAPOL4WayEnable; - - /* This configuration allows a host wakeup on an network scan offload match. - */ - tANI_U8 ucWowNetScanOffloadMatch; - - /* This configuration allows a host wakeup on any GTK rekeying error. - */ - tANI_U8 ucWowGTKRekeyError; - - /* This configuration allows a host wakeup on BSS connection loss. - */ - tANI_U8 ucWoWBSSConnLoss; - - tANI_U8 bssIdx; - -} tHalWowlEnterParams, *tpHalWowlEnterParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalWowlEnterParams enterWowlParams; -} tHalWowlEnterReqMsg, *tpHalWowlEnterReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_EXIT_WOWL_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 bssIdx; - -} tHalWowlExitParams, *tpHalWowlExitParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalWowlExitParams exitWowlParams; -} tHalWowlExitReqMsg, *tpHalWowlExitReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_GET_RSSI_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; -} tHalGetRssiReqMsg, *tpHalGetRssiReqMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - /* Valid STA Idx for per STA stats request */ - tANI_U32 staId; - -}tHalRoamRssiReqParams, *tpHalRoamRssiReqParams; - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_GET_ROAM_RSSI_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRoamRssiReqParams roamRssiReqParams; -} tHalGetRoamRssiReqMsg, *tpHalGetRoamRssiReqMsg; - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_SET_UAPSD_AC_PARAMS_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST { - tANI_U8 staidx; // STA index - tANI_U8 ac; // Access Category - tANI_U8 up; // User Priority - tANI_U32 srvInterval; // Service Interval - tANI_U32 susInterval; // Suspend Interval - tANI_U32 delayInterval; // Delay Interval -} tUapsdInfo, tpUapsdInfo; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tUapsdInfo enableUapsdAcParams; -} tHalSetUapsdAcParamsReqMsg, *tpHalSetUapsdAcParamsReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_CONFIGURE_RXP_FILTER_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST { - tANI_U8 setMcstBcstFilterSetting; - tANI_U8 setMcstBcstFilter; -} tHalConfigureRxpFilterReqParams, tpHalConfigureRxpFilterReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalConfigureRxpFilterReqParams configureRxpFilterReqParams; -} tHalConfigureRxpFilterReqMsg, *tpHalConfigureRxpFilterReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ENTER_IMPS_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalEnterImpsRspParams, *tpHalEnterImpsRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalEnterImpsRspParams enterImpsRspParams; -} tHalEnterImpsRspMsg, *tpHalEnterImpsRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_EXIT_IMPS_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalExitImpsRspParams, *tpHalExitImpsRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalExitImpsRspParams exitImpsRspParams; -} tHalExitImpsRspMsg, *tpHalExitImpsRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ENTER_BMPS_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - tANI_U8 bssIdx; -} tHalEnterBmpsRspParams, *tpHalEnterBmpsRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalEnterBmpsRspParams enterBmpsRspParams; -} tHalEnterBmpsRspMsg, *tpHalEnterBmpsRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_EXIT_BMPS_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - tANI_U8 bssIdx; -} tHalExitBmpsRspParams, *tpHalExitBmpsRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalExitBmpsRspParams exitBmpsRspParams; -} tHalExitBmpsRspMsg, *tpHalExitBmpsRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ENTER_UAPSD_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - tANI_U8 bssIdx; -}tUapsdRspParams, *tpUapsdRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tUapsdRspParams enterUapsdRspParams; -} tHalEnterUapsdRspMsg, *tpHalEnterUapsdRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_EXIT_UAPSD_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - tANI_U8 bssIdx; -} tHalExitUapsdRspParams, *tpHalExitUapsdRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalExitUapsdRspParams exitUapsdRspParams; -} tHalExitUapsdRspMsg, *tpHalExitUapsdRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_RSSI_NOTIFICATION_IND - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 bRssiThres1PosCross : 1; - tANI_U32 bRssiThres1NegCross : 1; - tANI_U32 bRssiThres2PosCross : 1; - tANI_U32 bRssiThres2NegCross : 1; - tANI_U32 bRssiThres3PosCross : 1; - tANI_U32 bRssiThres3NegCross : 1; - tANI_U32 avgRssi : 8; - tANI_U32 uBssIdx : 8; - tANI_U32 isBTCoexCompromise : 1; - tANI_U32 bReserved : 9; -} tHalRSSINotification, *tpHalRSSINotification; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRSSINotification rssiNotificationParams; -} tHalRSSINotificationIndMsg, *tpHalRSSINotificationIndMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_GET_RSSI_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - tANI_S8 rssi; -} tHalGetRssiParams, *tpHalGetRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalGetRssiParams rssiRspParams; -} tHalGetRssiRspMsg, *tpHalGetRssiRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_GET_ROAM_RSSI_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - - tANI_U8 staId; - tANI_S8 rssi; -} tHalGetRoamRssiParams, *tpHalGetRoamRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalGetRoamRssiParams roamRssiRspParams; -} tHalGetRoamRssiRspMsg, *tpHalGetRoamRssiRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ENTER_WOWL_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - tANI_U8 bssIdx; -} tHalEnterWowlRspParams, *tpHalEnterWowlRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalEnterWowlRspParams enterWowlRspParams; -} tHalWowlEnterRspMsg, *tpHalWowlEnterRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_EXIT_WOWL_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - tANI_U8 bssIdx; -} tHalExitWowlRspParams, *tpHalExitWowlRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalExitWowlRspParams exitWowlRspParams; -} tHalWowlExitRspMsg, *tpHalWowlExitRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ADD_BCN_FILTER_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalAddBcnFilterRspParams, *tpHalAddBcnFilterRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalAddBcnFilterRspParams addBcnFilterRspParams; -} tHalAddBcnFilterRspMsg, *tpHalAddBcnFilterRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_REM_BCN_FILTER_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalRemBcnFilterRspParams, *tpHalRemBcnFilterRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRemBcnFilterRspParams remBcnFilterRspParams; -} tHalRemBcnFilterRspMsg, *tpHalRemBcnFilterRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_ADD_WOWL_BCAST_PTRN_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - tANI_U8 bssIdx; -} tHalAddWowlBcastPtrnRspParams, *tpHalAddWowlBcastPtrnRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalAddWowlBcastPtrnRspParams addWowlBcastPtrnRspParams; -} tHalAddWowlBcastPtrnRspMsg, *tpHalAddWowlBcastPtrnRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_DEL_WOWL_BCAST_PTRN_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - tANI_U8 bssIdx; -} tHalDelWowlBcastPtrnRspParams, *tpHalDelWowlBcastPtrnRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalDelWowlBcastPtrnRspParams delWowlBcastRspParams; -} tHalDelWowlBcastPtrnRspMsg, *tpHalDelWowlBcastPtrnRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_HOST_OFFLOAD_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalHostOffloadRspParams, *tpHalHostOffloadRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalHostOffloadRspParams hostOffloadRspParams; -} tHalHostOffloadRspMsg, *tpHalHostOffloadRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_KEEP_ALIVE_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalKeepAliveRspParams, *tpHalKeepAliveRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalKeepAliveRspParams keepAliveRspParams; -} tHalKeepAliveRspMsg, *tpHalKeepAliveRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_SET_RSSI_THRESH_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalSetRssiThreshRspParams, *tpHalSetRssiThreshRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalSetRssiThreshRspParams setRssiThreshRspParams; -} tHalSetRssiThreshRspMsg, *tpHalSetRssiThreshRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_SET_UAPSD_AC_PARAMS_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalSetUapsdAcParamsRspParams, *tpHalSetUapsdAcParamsRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalSetUapsdAcParamsRspParams setUapsdAcParamsRspParams; -} tHalSetUapsdAcParamsRspMsg, *tpHalSetUapsdAcParamsRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_CONFIGURE_RXP_FILTER_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalConfigureRxpFilterRspParams, *tpHalConfigureRxpFilterRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalConfigureRxpFilterRspParams configureRxpFilterRspParams; -} tHalConfigureRxpFilterRspMsg, *tpHalConfigureRxpFilterRspMsg; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_SET_MAX_TX_POWER_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tSirMacAddr bssId; // BSSID is needed to identify which session issued this request. As - //the request has power constraints, this should be applied only to that session - tSirMacAddr selfStaMacAddr; - //In request, - //power == MaxTx power to be used. - tPowerdBm power; - -}tSetMaxTxPwrParams, *tpSetMaxTxPwrParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetMaxTxPwrParams setMaxTxPwrParams; -}tSetMaxTxPwrReq, *tpSetMaxTxPwrReq; - -/*--------------------------------------------------------------------------- -*WLAN_HAL_SET_MAX_TX_POWER_RSP -*--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - //power == tx power used for management frames. - tPowerdBm power; - - /* success or failure */ - tANI_U32 status; -}tSetMaxTxPwrRspParams, *tpSetMaxTxPwrRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetMaxTxPwrRspParams setMaxTxPwrRspParams; -}tSetMaxTxPwrRspMsg, *tpSetMaxTxPwrRspMsg; - - -/*--------------------------------------------------------------------------- - *WLAN_HAL_SET_MAX_TX_POWER_PER_BAND_REQ - *--------------------------------------------------------------------------*/ - -/* Band types for WLAN_HAL_SET_MAX_TX_POWER_PER_BAND_REQ between WDI and HAL */ -typedef enum -{ - WLAN_HAL_SET_MAX_TX_POWER_BAND_ALL = 0, - // For 2.4GHz or 5GHz bands - WLAN_HAL_SET_MAX_TX_POWER_BAND_2_4_GHZ, - WLAN_HAL_SET_MAX_TX_POWER_BAND_5_0_GHZ, - // End of valid enums - WLAN_HAL_SET_MAX_TX_POWER_BAND_MAX = WLAN_HAL_MAX_ENUM_SIZE, -}tHalSetMaxTxPwrBandInfo; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalSetMaxTxPwrBandInfo bandInfo; // 2_4_GHZ or 5_0_GHZ - tPowerdBm power; // In request, power == MaxTx power to be used. -}tSetMaxTxPwrPerBandParams, *tpSetMaxTxPwrPerBandParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetMaxTxPwrPerBandParams setMaxTxPwrPerBandParams; -}tSetMaxTxPwrPerBandReq, *tpSetMaxTxPwrPerBandReq; - -/*--------------------------------------------------------------------------- -*WLAN_HAL_SET_MAX_TX_POWER_PER_BAND_RSP -*--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - //power == tx power used for management frames. - tPowerdBm power; - - /* success or failure */ - tANI_U32 status; -}tSetMaxTxPwrPerBandRspParams, *tpSetMaxTxPwrPerBandRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetMaxTxPwrPerBandRspParams setMaxTxPwrPerBandRspParams; -}tSetMaxTxPwrPerBandRspMsg, *tpSetMaxTxPwrPerBandRspMsg; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_SET_TX_POWER_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* TX Power in milli watts */ - tANI_U32 txPower; - tANI_U8 bssIdx; -}tSetTxPwrReqParams, *tpSetTxPwrReqParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetTxPwrReqParams setTxPwrReqParams; -}tSetTxPwrReqMsg, *tpSetTxPwrReqMsg; - -/*--------------------------------------------------------------------------- -*WLAN_HAL_SET_TX_POWER_RSP -*--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -}tSetTxPwrRspParams, *tpSetTxPwrRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetTxPwrRspParams setTxPwrRspParams; -}tSetTxPwrRspMsg, *tpSetTxPwrRspMsg; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_GET_TX_POWER_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 staId; -}tGetTxPwrReqParams, *tpGetTxPwrReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tGetTxPwrReqParams getTxPwrReqParams; -}tGetTxPwrReqMsg, *tpGetTxPwrReqMsg; - -/*--------------------------------------------------------------------------- -*WLAN_HAL_GET_TX_POWER_RSP -*--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - - /* TX Power in milli watts */ - tANI_U32 txPower; -}tGetTxPwrRspParams, *tpGetTxPwrRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tGetTxPwrRspParams getTxPwrRspParams; -}tGetTxPwrRspMsg, *tpGetTxPwrRspMsg; - -#ifdef WLAN_FEATURE_P2P -/*--------------------------------------------------------------------------- - *WLAN_HAL_SET_P2P_GONOA_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 opp_ps; - tANI_U32 ctWindow; - tANI_U8 count; - tANI_U32 duration; - tANI_U32 interval; - tANI_U32 single_noa_duration; - tANI_U8 psSelection; -}tSetP2PGONOAParams, *tpSetP2PGONOAParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetP2PGONOAParams setP2PGONOAParams; -}tSetP2PGONOAReq, *tpSetP2PGONOAReq; - -/*--------------------------------------------------------------------------- -*WLAN_HAL_SET_P2P_GONOA_RSP -*--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -}tSetP2PGONOARspParams, *tpSetP2PGONOARspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetP2PGONOARspParams setP2PGONOARspParams; -}tSetP2PGONOARspMsg, *tpSetP2PGONOARspMsg; -#endif - -/*--------------------------------------------------------------------------- - *WLAN_HAL_ADD_SELF_STA_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tSirMacAddr selfMacAddr; - tANI_U32 status; -}tAddStaSelfParams, *tpAddStaSelfParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tSirMacAddr selfMacAddr; - tANI_U32 status; - tHalIfacePersona iface_persona; -}tAddStaSelfParams_V1, *tpAddStaSelfParams_V1; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - PACKED_PRE union PACKED_POST { - tAddStaSelfParams addStaSelfParams; - tAddStaSelfParams_V1 addStaSelfParams_V1; - }uAddStaSelfParams; -}tAddStaSelfReq, *tpAddStaSelfReq; - -/*--------------------------------------------------------------------------- -*WLAN_HAL_ADD_SELF_STA_RSP -*--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - - /*Self STA Index */ - tANI_U8 selfStaIdx; - - /* DPU Index (IGTK, PTK, GTK all same) */ - tANI_U8 dpuIdx; - - /* DPU Signature */ - tANI_U8 dpuSignature; - -}tAddStaSelfRspParams, *tpAddStaSelfRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tAddStaSelfRspParams addStaSelfRspParams; -}tAddStaSelfRspMsg, *tpAddStaSelfRspMsg; - - -/*--------------------------------------------------------------------------- - WLAN_HAL_DEL_STA_SELF_REQ ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tSirMacAddr selfMacAddr; - -}tDelStaSelfParams, *tpDelStaSelfParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tDelStaSelfParams delStaSelfParams; -} tDelStaSelfReqMsg, *tpDelStaSelfReqMsg; - - -/*--------------------------------------------------------------------------- - WLAN_HAL_DEL_STA_SELF_RSP ----------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*success or failure */ - tANI_U32 status; - - tSirMacAddr selfMacAddr; -}tDelStaSelfRspParams, *tpDelStaSelfRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tDelStaSelfRspParams delStaSelfRspParams; -} tDelStaSelfRspMsg, *tpDelStaSelfRspMsg; - - -#ifdef WLAN_FEATURE_VOWIFI_11R - -/*--------------------------------------------------------------------------- - *WLAN_HAL_AGGR_ADD_TS_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* Station Index */ - tANI_U16 staIdx; - - /* TSPEC handler uniquely identifying a TSPEC for a STA in a BSS */ - /* This will carry the bitmap with the bit positions representing different AC.s*/ - tANI_U16 tspecIdx; - - /* Tspec info per AC To program TPE with required parameters */ - tSirMacTspecIE tspec[WLAN_HAL_MAX_AC]; - - /* U-APSD Flags: 1b per AC. Encoded as follows: - b7 b6 b5 b4 b3 b2 b1 b0 = - X X X X BE BK VI VO */ - tANI_U8 uAPSD; - - /* These parameters are for all the access categories */ - tANI_U32 srvInterval[WLAN_HAL_MAX_AC]; // Service Interval - tANI_U32 susInterval[WLAN_HAL_MAX_AC]; // Suspend Interval - tANI_U32 delayInterval[WLAN_HAL_MAX_AC]; // Delay Interval - -}tAggrAddTsParams, *tpAggrAddTsParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tAggrAddTsParams aggrAddTsParam; -}tAggrAddTsReq, *tpAggrAddTsReq; - -/*--------------------------------------------------------------------------- -*WLAN_HAL_AGGR_ADD_TS_RSP -*--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status0; - /* FIXME PRIMA for future use for 11R */ - tANI_U32 status1; -}tAggrAddTsRspParams, *tpAggrAddTsRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tAggrAddTsRspParams aggrAddTsRspParam; -}tAggrAddTsRspMsg, *tpAggrAddTsRspMsg; - -#endif - -/*--------------------------------------------------------------------------- - * WLAN_HAL_CONFIGURE_APPS_CPU_WAKEUP_STATE_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 isAppsCpuAwake; -} tHalConfigureAppsCpuWakeupStateReqParams, *tpHalConfigureAppsCpuWakeupStatReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalConfigureAppsCpuWakeupStateReqParams appsStateReqParams; -} tHalConfigureAppsCpuWakeupStateReqMsg, *tpHalConfigureAppsCpuWakeupStateReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_CONFIGURE_APPS_CPU_WAKEUP_STATE_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalConfigureAppsCpuWakeupStateRspParams, *tpHalConfigureAppsCpuWakeupStateRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalConfigureAppsCpuWakeupStateRspParams appsStateRspParams; -} tHalConfigureAppsCpuWakeupStateRspMsg, *tpHalConfigureAppsCpuWakeupStateRspMsg; -/*--------------------------------------------------------------------------- - * WLAN_HAL_DUMP_COMMAND_REQ - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 argument1; - tANI_U32 argument2; - tANI_U32 argument3; - tANI_U32 argument4; - tANI_U32 argument5; - -}tHalDumpCmdReqParams,*tpHalDumpCmdReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalDumpCmdReqParams dumpCmdReqParams; -} tHalDumpCmdReqMsg, *tpHalDumpCmdReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_DUMP_COMMAND_RSP - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - /*Length of the responce message*/ - tANI_U32 rspLength; - /*FiXME: Currently considering the the responce will be less than 100bytes */ - tANI_U8 rspBuffer[DUMPCMD_RSP_BUFFER]; - -} tHalDumpCmdRspParams, *tpHalDumpCmdRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalDumpCmdRspParams dumpCmdRspParams; -} tHalDumpCmdRspMsg, *tpHalDumpCmdRspMsg; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_COEX_IND - *-------------------------------------------------------------------------*/ -#define WLAN_COEX_IND_DATA_SIZE (4) -#define WLAN_COEX_IND_TYPE_DISABLE_HB_MONITOR (0) -#define WLAN_COEX_IND_TYPE_ENABLE_HB_MONITOR (1) -#define WLAN_COEX_IND_TYPE_SCANS_ARE_COMPROMISED_BY_COEX (2) -#define WLAN_COEX_IND_TYPE_SCANS_ARE_NOT_COMPROMISED_BY_COEX (3) -#define WLAN_COEX_IND_TYPE_DISABLE_AGGREGATION_IN_2p4 (4) -#define WLAN_COEX_IND_TYPE_ENABLE_AGGREGATION_IN_2p4 (5) - -typedef PACKED_PRE struct PACKED_POST -{ - /*Coex Indication Type*/ - tANI_U32 coexIndType; - - /*Coex Indication Data*/ - tANI_U32 coexIndData[WLAN_COEX_IND_DATA_SIZE]; -}tCoexIndParams,*tpCoexIndParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tCoexIndParams coexIndParams; -}tCoexIndMsg, *tpCoexIndMsg; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_OTA_TX_COMPL_IND - *-------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - /*Tx Complete Indication Success or Failure*/ - tANI_U32 status; -}tTxComplParams,*tpTxComplParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTxComplParams txComplParams; -}tTxComplIndMsg, *tpTxComplIndMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_HOST_SUSPEND_IND - *-------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 configuredMcstBcstFilterSetting; - tANI_U32 activeSessionCount; -}tHalWlanHostSuspendIndParam,*tpHalWlanHostSuspendIndParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalWlanHostSuspendIndParam suspendIndParams; -}tHalWlanHostSuspendIndMsg, *tpHalWlanHostSuspendIndMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_EXCLUDE_UNENCRYTED_IND - *-------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_BOOLEAN bDot11ExcludeUnencrypted; - tSirMacAddr bssId; -}tHalWlanExcludeUnEncryptedIndParam,*tpHalWlanExcludeUnEncryptedIndParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalWlanExcludeUnEncryptedIndParam excludeUnEncryptedIndParams; -}tHalWlanExcludeUnEncrptedIndMsg, *tpHalWlanExcludeUnEncrptedIndMsg; - -#ifdef WLAN_FEATURE_P2P -/*--------------------------------------------------------------------------- - *WLAN_HAL_NOA_ATTR_IND - *-------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 index ; - tANI_U8 oppPsFlag ; - tANI_U16 ctWin ; - - tANI_U16 uNoa1IntervalCnt; - tANI_U16 bssIdx; - tANI_U32 uNoa1Duration; - tANI_U32 uNoa1Interval; - tANI_U32 uNoa1StartTime; - - tANI_U16 uNoa2IntervalCnt; - tANI_U16 rsvd2; - tANI_U32 uNoa2Duration; - tANI_U32 uNoa2Interval; - tANI_U32 uNoa2StartTime; - - tANI_U32 status; -}tNoaAttrIndParams, *tpNoaAttrIndParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tNoaAttrIndParams noaAttrIndParams; -}tNoaAttrIndMsg, *tpNoaAttrIndMsg; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_NOA_START_IND - *-------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 status; - tANI_U32 bssIdx; -}tNoaStartIndParams, *tpNoaStartIndParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tNoaStartIndParams noaStartIndParams; -}tNoaStartIndMsg, tpNoaStartIndMsg; -#endif - -/*--------------------------------------------------------------------------- - * WLAN_HAL_HOST_RESUME_REQ - *-------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 configuredMcstBcstFilterSetting; -}tHalWlanHostResumeReqParam,*tpHalWlanHostResumeReqParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalWlanHostResumeReqParam resumeReqParams; -}tHalWlanHostResumeReqMsg, *tpHalWlanHostResumeReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_HOST_RESUME_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalHostResumeRspParams, *tpHalHostResumeRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalHostResumeRspParams hostResumeRspParams; -} tHalHostResumeRspMsg, *tpHalHostResumeRspMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U16 staIdx; - // Peer MAC Address, whose BA session has timed out - tSirMacAddr peerMacAddr; - // TID for which a BA session timeout is being triggered - tANI_U8 baTID; - // DELBA direction - // 1 - Originator - // 0 - Recipient - tANI_U8 baDirection; - tANI_U32 reasonCode; - tSirMacAddr bssId; // TO SUPPORT BT-AMP -} tHalWlanDelBaIndMsg, *tpHalWlanDelBaIndMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalWlanDelBaIndMsg hostdelBaParam; -} tHalDelBAIndMsg, *tpHalDelBAIndMsg; - -/*--------------------------------------------------------------------------- - *PNO Messages - *-------------------------------------------------------------------------*/ -/* Max number of channels that a network can be found on*/ -/* WLAN_HAL_PNO_MAX_NETW_CHANNELS and WLAN_HAL_PNO_MAX_NETW_CHANNELS_EX should - * be changed at same time - */ -#define WLAN_HAL_PNO_MAX_NETW_CHANNELS 60 - -/*Max number of channels that a network can be found on*/ -#define WLAN_HAL_PNO_MAX_NETW_CHANNELS_EX 60 - -/*Maximum numbers of networks supported by PNO*/ -#define WLAN_HAL_PNO_MAX_SUPP_NETWORKS 16 - -/*The number of scan time intervals that can be programmed into PNO*/ -#define WLAN_HAL_PNO_MAX_SCAN_TIMERS 10 - -/*Maximum size of the probe template*/ -#define WLAN_HAL_PNO_MAX_PROBE_SIZE 450 - -/*Type of PNO enabling - Immediate - scanning will start immediately and PNO procedure will - be repeated based on timer - Suspend - scanning will start at suspend - Resume - scanning will start on system resume - Delay - start the scan timer to trigger PNO scan - */ -typedef enum -{ - ePNO_MODE_IMMEDIATE, - ePNO_MODE_ON_SUSPEND, - ePNO_MODE_ON_RESUME, - ePNO_MODE_DELAY, - ePNO_MODE_PROXIMITY, // FEATURE_WIFI_PROXIMITY - ePNO_MODE_MAX = WLAN_HAL_MAX_ENUM_SIZE -} ePNOMode; - -/*Authentication type*/ -typedef enum -{ - eAUTH_TYPE_ANY = 0, - eAUTH_TYPE_OPEN_SYSTEM = 1, - - // Upper layer authentication types - eAUTH_TYPE_WPA = 2, - eAUTH_TYPE_WPA_PSK = 3, - - eAUTH_TYPE_RSN = 4, - eAUTH_TYPE_RSN_PSK = 5, - eAUTH_TYPE_FT_RSN = 6, - eAUTH_TYPE_FT_RSN_PSK = 7, - eAUTH_TYPE_WAPI_WAI_CERTIFICATE = 8, - eAUTH_TYPE_WAPI_WAI_PSK = 9, - eAUTH_TYPE_CCKM_WPA = 10, - eAUTH_TYPE_CCKM_RSN = 11, - - eAUTH_TYPE_MAX = WLAN_HAL_MAX_ENUM_SIZE - -}tAuthType; - -/* Encryption type */ -typedef enum eEdType -{ - eED_ANY = 0, - eED_NONE = 1, - eED_WEP = 2, - eED_TKIP = 3, - eED_CCMP = 4, - eED_WPI = 5, - - eED_TYPE_MAX = WLAN_HAL_MAX_ENUM_SIZE -} tEdType; - -/* SSID broadcast type */ -typedef enum eSSIDBcastType -{ - eBCAST_UNKNOWN = 0, - eBCAST_NORMAL = 1, - eBCAST_HIDDEN = 2, - - eBCAST_TYPE_MAX = WLAN_HAL_MAX_ENUM_SIZE -} tSSIDBcastType; - -/* - The network description for which PNO will have to look for -*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*SSID of the BSS*/ - tSirMacSSid ssId; - - /*Authentication type for the network*/ - tAuthType authentication; - - /*Encryption type for the network*/ - tEdType encryption; - - /*Indicate the channel on which the Network can be found - 0 - if all channels */ - tANI_U8 ucChannelCount; - tANI_U8 aChannels[WLAN_HAL_PNO_MAX_NETW_CHANNELS]; - - /*Indicates the RSSI threshold for the network to be considered*/ - tANI_U8 rssiThreshold; -}tNetworkType; - -typedef PACKED_PRE struct PACKED_POST -{ - /*How much it should wait */ - tANI_U32 uTimerValue; - - /*How many times it should repeat that wait value - 0 - keep using this timer until PNO is disabled*/ - tANI_U32 uTimerRepeat; - - /*e.g: 2 3 - 4 0 - - it will wait 2s between consecutive scans for 3 times - - after that it will wait 4s between consecutive scans until disabled*/ -}tScanTimer; - -/* - The network parameters to be sent to the PNO algorithm -*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*set to 0 if you wish for PNO to use its default telescopic timer*/ - tANI_U8 ucScanTimersCount; - - /*A set value represents the amount of time that PNO will wait between - two consecutive scan procedures - If the desired is for a uniform timer that fires always at the exact same - interval - one single value is to be set - If there is a desire for a more complex - telescopic like timer multiple - values can be set - once PNO reaches the end of the array it will - continue scanning at intervals presented by the last value*/ - tScanTimer aTimerValues[WLAN_HAL_PNO_MAX_SCAN_TIMERS]; - -}tScanTimersType; - -typedef PACKED_PRE struct PACKED_POST { - - /*Enable PNO*/ - tANI_U32 enable; - - /*Immediate, On Suspend, On Resume*/ - ePNOMode modePNO; - - /*Number of networks sent for PNO*/ - tANI_U32 ucNetworksCount; - - /*The networks that PNO needs to look for*/ - tNetworkType aNetworks[WLAN_HAL_PNO_MAX_SUPP_NETWORKS]; - - /*The scan timers required for PNO*/ - tScanTimersType scanTimers; - - /*Probe template for 2.4GHz band*/ - tANI_U16 us24GProbeSize; - tANI_U8 a24GProbeTemplate[WLAN_HAL_PNO_MAX_PROBE_SIZE]; - - /*Probe template for 5GHz band*/ - tANI_U16 us5GProbeSize; - tANI_U8 a5GProbeTemplate[WLAN_HAL_PNO_MAX_PROBE_SIZE]; - -} tPrefNetwListParams, * tpPrefNetwListParams; - -/* - Preferred network list request -*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tPrefNetwListParams prefNetwListParams; -} tSetPrefNetwListReq, *tpSetPrefNetwListReq; - - -/* - The network description for which PNO will have to look for -*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*SSID of the BSS*/ - tSirMacSSid ssId; - - /*Authentication type for the network*/ - tAuthType authentication; - - /*Encryption type for the network*/ - tEdType encryption; - - /*SSID broadcast type, normal, hidden or unknown*/ - tSSIDBcastType bcastNetworkType; - - /*Indicate the channel on which the Network can be found - 0 - if all channels */ - tANI_U8 ucChannelCount; - tANI_U8 aChannels[WLAN_HAL_PNO_MAX_NETW_CHANNELS]; - - /*Indicates the RSSI threshold for the network to be considered*/ - tANI_U8 rssiThreshold; -}tNetworkTypeNew; - -typedef PACKED_PRE struct PACKED_POST { - - /*Enable PNO*/ - tANI_U32 enable; - - /*Immediate, On Suspend, On Resume*/ - ePNOMode modePNO; - - /*Number of networks sent for PNO*/ - tANI_U32 ucNetworksCount; - - /*The networks that PNO needs to look for*/ - tNetworkTypeNew aNetworks[WLAN_HAL_PNO_MAX_SUPP_NETWORKS]; - - /*The scan timers required for PNO*/ - tScanTimersType scanTimers; - - /*Probe template for 2.4GHz band*/ - tANI_U16 us24GProbeSize; - tANI_U8 a24GProbeTemplate[WLAN_HAL_PNO_MAX_PROBE_SIZE]; - - /*Probe template for 5GHz band*/ - tANI_U16 us5GProbeSize; - tANI_U8 a5GProbeTemplate[WLAN_HAL_PNO_MAX_PROBE_SIZE]; - -} tPrefNetwListParamsNew, * tpPrefNetwListParamsNew; - -/* - Preferred network list request new -*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tPrefNetwListParamsNew prefNetwListParams; -} tSetPrefNetwListReqNew, *tpSetPrefNetwListReqNew; - -#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD -typedef PACKED_PRE struct PACKED_POST -{ - tSirMacSSid ssId; - tANI_U8 currAPbssid[HAL_MAC_ADDR_LEN]; - tANI_U32 authentication; - tEdType encryption; - tEdType mcencryption; - tANI_U8 ChannelCount; - tANI_U8 ChannelCache[WLAN_HAL_ROAM_SCAN_MAX_CHANNELS]; -}tRoamNetworkType; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 mdiePresent; - tANI_U16 mobilityDomain; -}tMobilityDomainInfo; - -typedef PACKED_PRE struct PACKED_POST { - eAniBoolean RoamScanOffloadEnabled; - tANI_S8 LookupThreshold; - tANI_U8 RoamRssiDiff; - tANI_U8 ChannelCacheType; - tANI_U8 Command; - tANI_U8 StartScanReason; - tANI_U16 NeighborScanTimerPeriod; - tANI_U16 NeighborRoamScanRefreshPeriod; - tANI_U16 NeighborScanChannelMinTime; - tANI_U16 NeighborScanChannelMaxTime; - tANI_U16 EmptyRefreshScanPeriod; - tANI_U8 ValidChannelCount; - tANI_U8 ValidChannelList[WLAN_HAL_ROAM_SCAN_MAX_CHANNELS]; - eAniBoolean IsESEEnabled; - - tANI_U16 us24GProbeSize; - tANI_U8 a24GProbeTemplate[WLAN_HAL_ROAM_SCAN_MAX_PROBE_SIZE]; - tANI_U16 us5GProbeSize; - tANI_U8 a5GProbeTemplate[WLAN_HAL_ROAM_SCAN_MAX_PROBE_SIZE]; - /* Add Reserved bytes */ - tANI_U8 nProbes; - tANI_U16 HomeAwayTime; - eAniBoolean MAWCEnabled; - tANI_S8 RxSensitivityThreshold; - tANI_U8 ReservedBytes[WLAN_HAL_ROAM_SCAN_RESERVED_BYTES]; - tRoamNetworkType ConnectedNetwork; - tMobilityDomainInfo MDID; -} tRoamCandidateListParams, * tpRoamCandidateListParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tRoamCandidateListParams RoamScanOffloadNetwListParams; -} tSetRoamScanOffloadReq, *tpRoamScanOffloadReq; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - - /* status of the request - just to indicate that PNO has acknowledged - * the request and will start scanning */ - tANI_U32 status; -} tSetRoamOffloadScanResp, *tpSetRoamOffloadScanResp; -#endif - -/* - Preferred network list response -*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - - /* status of the request - just to indicate that PNO has acknowledged - * the request and will start scanning*/ - tANI_U32 status; -} tSetPrefNetwListResp, *tpSetPrefNetwListResp; - -/* - Preferred network indication parameters -*/ -typedef PACKED_PRE struct PACKED_POST { - - /*Network that was found with the highest RSSI*/ - tSirMacSSid ssId; - - /*Indicates the RSSI */ - tANI_U8 rssi; - - //The MPDU frame length of a beacon or probe rsp. data is the start of the frame - tANI_U16 frameLength; - -} tPrefNetwFoundParams, * tpPrefNetwFoundParams; - -/* - Preferred network found indication -*/ -typedef PACKED_PRE struct PACKED_POST { - - tHalMsgHeader header; - tPrefNetwFoundParams prefNetwFoundParams; -} tPrefNetwFoundInd, *tpPrefNetwFoundInd; - - -typedef PACKED_PRE struct PACKED_POST { - - /*RSSI Threshold*/ - tANI_U8 ucRssiThreshold; - -} tRssiFilterParams, * tpRssiFilterParams; - -/* - RSSI Filter request -*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tRssiFilterParams prefRSSIFilterParams; -} tSetRssiFilterReq, *tpSetRssiFilterReq; - -/* - Set RSSI filter resp -*/ -typedef PACKED_PRE struct PACKED_POST{ - tHalMsgHeader header; - /*status of the request */ - tANI_U32 status; -} tSetRssiFilterResp, *tpSetRssiFilterResp; -/* - Update scan params -*/ -typedef PACKED_PRE struct PACKED_POST -{ - - /*Host setting for 11d*/ - tANI_U8 b11dEnabled; - - /*Lets PNO know that host has determined the regulatory domain*/ - tANI_U8 b11dResolved; - - /*Channels on which PNO is allowed to scan*/ - tANI_U8 ucChannelCount; - tANI_U8 aChannels[WLAN_HAL_PNO_MAX_NETW_CHANNELS]; - - /*Minimum channel time*/ - tANI_U16 usActiveMinChTime; - - /*Maximum channel time*/ - tANI_U16 usActiveMaxChTime; - - /*Minimum channel time*/ - tANI_U16 usPassiveMinChTime; - - /*Maximum channel time*/ - tANI_U16 usPassiveMaxChTime; - - /*Cb State*/ - ePhyChanBondState cbState; - -} tUpdateScanParams, * tpUpdateScanParams; - -/* - Update scan params -*/ -typedef PACKED_PRE struct PACKED_POST -{ - - /*Host setting for 11d*/ - tANI_U8 b11dEnabled; - - /*Lets PNO know that host has determined the regulatory domain*/ - tANI_U8 b11dResolved; - - /*Channels on which PNO is allowed to scan*/ - tANI_U8 ucChannelCount; - tANI_U8 aChannels[WLAN_HAL_PNO_MAX_NETW_CHANNELS_EX]; - - /*Minimum channel time*/ - tANI_U16 usActiveMinChTime; - - /*Maximum channel time*/ - tANI_U16 usActiveMaxChTime; - - /*Minimum channel time*/ - tANI_U16 usPassiveMinChTime; - - /*Maximum channel time*/ - tANI_U16 usPassiveMaxChTime; - - /*Cb State*/ - ePhyChanBondState cbState; - -} tUpdateScanParamsEx, * tpUpdateScanParamsEx; - -/* - Update scan params - sent from host to PNO - to be used during PNO scanning -*/ -typedef PACKED_PRE struct PACKED_POST{ - - tHalMsgHeader header; - tUpdateScanParams scanParams; -} tUpdateScanParamsReq, *tpUpdateScanParamsReq; - -/* - Update scan params - sent from host to PNO - to be used during PNO scanning -*/ -typedef PACKED_PRE struct PACKED_POST{ - - tHalMsgHeader header; - tUpdateScanParamsEx scanParams; -} tUpdateScanParamsReqEx, *tpUpdateScanParamsReqEx; - -/* - Update scan params - sent from host to PNO - to be used during PNO scanning -*/ -typedef PACKED_PRE struct PACKED_POST{ - - tHalMsgHeader header; - - /*status of the request */ - tANI_U32 status; - -} tUpdateScanParamsResp, *tpUpdateScanParamsResp; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_SET_TX_PER_TRACKING_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 ucTxPerTrackingEnable; /* 0: disable, 1:enable */ - tANI_U8 ucTxPerTrackingPeriod; /* Check period, unit is sec. */ - tANI_U8 ucTxPerTrackingRatio; /* (Fail TX packet)/(Total TX packet) ratio, the unit is 10%. */ - tANI_U32 uTxPerTrackingWatermark; /* A watermark of check number, once the tx packet exceed this number, we do the check, default is 5 */ -} tHalTxPerTrackingReqParam, *tpHalTxPerTrackingReqParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalTxPerTrackingReqParam txPerTrackingParams; -} tHalSetTxPerTrackingReqMsg, *tpHalSetTxPerTrackingReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_SET_TX_PER_TRACKING_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; -} tHalTxPerTrackingRspParams, *tpHalTxPerTrackingRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalTxPerTrackingRspParams txPerTrackingRspParams; -} tHalSetTxPerTrackingRspMsg, *tpHalSetTxPerTrackingRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_TX_PER_HIT_IND - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; -}tTxPerHitIndMsg, *tpTxPerHitIndMsg; - -/*--------------------------------------------------------------------------- - *******************Packet Filtering Definitions Begin******************* - *--------------------------------------------------------------------------*/ -#define HAL_PROTOCOL_DATA_LEN 8 -#define HAL_MAX_NUM_MULTICAST_ADDRESS 240 -#define HAL_MAX_NUM_FILTERS 20 -#define HAL_MAX_CMP_PER_FILTER 10 - -typedef enum -{ - HAL_RCV_FILTER_TYPE_INVALID, - HAL_RCV_FILTER_TYPE_FILTER_PKT, - HAL_RCV_FILTER_TYPE_BUFFER_PKT, - HAL_RCV_FILTER_TYPE_MAX_ENUM_SIZE -}tHalReceivePacketFilterType; - -typedef enum -{ - HAL_FILTER_PROTO_TYPE_INVALID, - HAL_FILTER_PROTO_TYPE_MAC, - HAL_FILTER_PROTO_TYPE_ARP, - HAL_FILTER_PROTO_TYPE_IPV4, - HAL_FILTER_PROTO_TYPE_IPV6, - HAL_FILTER_PROTO_TYPE_UDP, - HAL_FILTER_PROTO_TYPE_MAX -}tHalRcvPktFltProtocolType; - -typedef enum -{ - HAL_FILTER_CMP_TYPE_INVALID, - HAL_FILTER_CMP_TYPE_EQUAL, - HAL_FILTER_CMP_TYPE_MASK_EQUAL, - HAL_FILTER_CMP_TYPE_NOT_EQUAL, - HAL_FILTER_CMP_TYPE_MAX -}tHalRcvPktFltCmpFlagType; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 protocolLayer; - tANI_U8 cmpFlag; - tANI_U16 dataLength; /* Length of the data to compare */ - tANI_U8 dataOffset; /* from start of the respective frame header */ - tANI_U8 reserved; /* Reserved field */ - tANI_U8 compareData[HAL_PROTOCOL_DATA_LEN]; /* Data to compare */ - tANI_U8 dataMask[HAL_PROTOCOL_DATA_LEN]; /* Mask to be applied on the received packet data before compare */ -}tHalRcvPktFilterParams, *tpHalRcvPktFilterParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 filterId; - tANI_U8 filterType; - tANI_U8 numParams; - tANI_U32 coalesceTime; - tHalRcvPktFilterParams paramsData[1]; -}tHalRcvPktFilterCfgType, *tpHalRcvPktFilterCfgType; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 filterId; - tANI_U8 filterType; - tANI_U8 numParams; - tANI_U32 coleasceTime; - tANI_U8 bssIdx; - tHalRcvPktFilterParams paramsData[1]; -}tHalSessionizedRcvPktFilterCfgType, *tpHalSessionizedRcvPktFilterCfgType; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRcvPktFilterCfgType pktFilterCfg; -} tHalSetRcvPktFilterReqMsg, *tpHalSetRcvPktFilterReqMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 dataOffset; /* from start of the respective frame header */ - tANI_U32 cMulticastAddr; - tSirMacAddr multicastAddr[HAL_MAX_NUM_MULTICAST_ADDRESS]; - tANI_U8 bssIdx; -} tHalRcvFltMcAddrListType, *tpHalRcvFltMcAddrListType; - -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - tANI_U8 bssIdx; -} tHalSetPktFilterRspParams, *tpHalSetPktFilterRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalSetPktFilterRspParams pktFilterRspParams; -} tHalSetPktFilterRspMsg, *tpHalSetPktFilterRspMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 bssIdx; -} tHalRcvFltPktMatchCntReqParams, *tpHalRcvFltPktMatchCntReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRcvFltPktMatchCntReqParams pktMatchCntReqParams; -} tHalRcvFltPktMatchCntReqMsg, *tpHalRcvFltPktMatchCntReqMsg; - - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 filterId; - tANI_U32 matchCnt; -} tHalRcvFltPktMatchCnt; -typedef PACKED_PRE struct PACKED_POST -{ - /* Success or Failure */ - tANI_U32 status; - tANI_U32 matchCnt; - tHalRcvFltPktMatchCnt filterMatchCnt[HAL_MAX_NUM_FILTERS]; - tANI_U8 bssIdx; -} tHalRcvFltPktMatchRspParams, *tptHalRcvFltPktMatchRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRcvFltPktMatchRspParams fltPktMatchRspParams; -} tHalRcvFltPktMatchCntRspMsg, *tpHalRcvFltPktMatchCntRspMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 status; /* only valid for response message */ - tANI_U8 filterId; - tANI_U8 bssIdx; -}tHalRcvFltPktClearParam, *tpHalRcvFltPktClearParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRcvFltPktClearParam filterClearParam; -} tHalRcvFltPktClearReqMsg, *tpHalRcvFltPktClearReqMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRcvFltPktClearParam filterClearParam; -} tHalRcvFltPktClearRspMsg, *tpHalRcvFltPktClearRspMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 status; - tANI_U8 bssIdx; -}tHalRcvFltPktSetMcListRspType, *tpHalRcvFltPktSetMcListRspType; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRcvFltMcAddrListType mcAddrList; -} tHalRcvFltPktSetMcListReqMsg, *tpHalRcvFltPktSetMcListReqMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRcvFltPktSetMcListRspType rspParam; -} tHalRcvFltPktSetMcListRspMsg, *tpHalRcvFltPktSetMcListRspMsg; - - -/*--------------------------------------------------------------------------- - *******************Packet Filtering Definitions End******************* - *--------------------------------------------------------------------------*/ - -/* - * There are two versions of this message - * Version 1 : Base version - * Current version : Base version + Max LI modulated DTIM - */ -typedef PACKED_PRE struct PACKED_POST -{ - /* Ignore DTIM */ - tANI_U32 uIgnoreDTIM; - - /*DTIM Period*/ - tANI_U32 uDTIMPeriod; - - /* Listen Interval */ - tANI_U32 uListenInterval; - - /* Broadcast Multicast Filter */ - tANI_U32 uBcastMcastFilter; - - /* Beacon Early Termination */ - tANI_U32 uEnableBET; - - /* Beacon Early Termination Interval */ - tANI_U32 uBETInterval; -}tSetPowerParamsVer1Type, *tpSetPowerParamsVer1Type; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetPowerParamsVer1Type powerParams; -} tSetPowerParamsVer1ReqMsg, *tpSetPowerParamsVer1ReqMsg; - -typedef PACKED_PRE struct PACKED_POST -{ - /* Ignore DTIM */ - tANI_U32 uIgnoreDTIM; - - /*DTIM Period*/ - tANI_U32 uDTIMPeriod; - - /* Listen Interval */ - tANI_U32 uListenInterval; - - /* Broadcast Multicast Filter */ - tANI_U32 uBcastMcastFilter; - - /* Beacon Early Termination */ - tANI_U32 uEnableBET; - - /* Beacon Early Termination Interval */ - tANI_U32 uBETInterval; - - /* MAX LI for modulated DTIM */ - tANI_U32 uMaxLIModulatedDTIM; -}tSetPowerParamsType, *tpSetPowerParamsType; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetPowerParamsType powerParams; -} tSetPowerParamsReqMsg, *tpSetPowerParamsReqMsg; - -typedef PACKED_PRE struct PACKED_POST{ - - tHalMsgHeader header; - - /*status of the request */ - tANI_U32 status; - -} tSetPowerParamsResp, *tpSetPowerParamsResp; - -/*--------------------------------------------------------------------------- - ****************Capability bitmap exchange definitions and macros starts************* - *--------------------------------------------------------------------------*/ - -typedef enum { - MCC = 0, - P2P = 1, - DOT11AC = 2, - SLM_SESSIONIZATION = 3, - DOT11AC_OPMODE = 4, - SAP32STA = 5, - TDLS = 6, - P2P_GO_NOA_DECOUPLE_INIT_SCAN = 7, - WLANACTIVE_OFFLOAD = 8, - BEACON_OFFLOAD = 9, - SCAN_OFFLOAD = 10, - ROAM_OFFLOAD = 11, - BCN_MISS_OFFLOAD = 12, - STA_POWERSAVE = 13, - STA_ADVANCED_PWRSAVE = 14, - AP_UAPSD = 15, - AP_DFS = 16, - BLOCKACK = 17, - PHY_ERR = 18, - BCN_FILTER = 19, - RTT = 20, - RATECTRL = 21, - WOW = 22, - WLAN_ROAM_SCAN_OFFLOAD = 23, - SPECULATIVE_PS_POLL = 24, - SCAN_SCH = 25, - IBSS_HEARTBEAT_OFFLOAD = 26, - WLAN_SCAN_OFFLOAD = 27, - WLAN_PERIODIC_TX_PTRN = 28, - ADVANCE_TDLS = 29, - BATCH_SCAN = 30, - FW_IN_TX_PATH = 31, - EXTENDED_NSOFFLOAD_SLOT = 32, - MCS8_9_IN_2_4G = 34, - MAX_FEATURE_SUPPORTED = 128, -} placeHolderInCapBitmap; - -typedef PACKED_PRE struct PACKED_POST{ - - tANI_U32 featCaps[4]; -} tWlanFeatCaps, *tpWlanFeatCaps; - -typedef PACKED_PRE struct PACKED_POST{ - - tHalMsgHeader header; - tWlanFeatCaps wlanFeatCaps; - -} tWlanFeatCapsMsg, *tpWlanFeatCapsMsg; - -#define IS_MCC_SUPPORTED_BY_HOST (!!(halMsg_GetHostWlanFeatCaps(MCC))) -#define IS_SLM_SESSIONIZATION_SUPPORTED_BY_HOST (!!(halMsg_GetHostWlanFeatCaps(SLM_SESSIONIZATION))) -#define IS_FEATURE_SUPPORTED_BY_HOST(featEnumValue) (!!halMsg_GetHostWlanFeatCaps(featEnumValue)) -#define IS_WLANACTIVE_OFFLOAD_SUPPORTED_BY_HOST (!!(halMsg_GetHostWlanFeatCaps(WLANACTIVE_OFFLOAD))) -#define IS_WLAN_ROAM_SCAN_OFFLOAD_SUPPORTED_BY_HOST (!!(halMsg_GetHostWlanFeatCaps(WLAN_ROAM_SCAN_OFFLOAD))) -#define IS_IBSS_HEARTBEAT_OFFLOAD_SUPPORTED_BY_HOST (!!(halMsg_GetHostWlanFeatCaps(IBSS_HEARTBEAT_OFFLOAD))) -#define IS_SCAN_OFFLOAD_SUPPORTED_BY_HOST (!!(halMsg_GetHostWlanFeatCaps(WLAN_SCAN_OFFLOAD))) - -tANI_U8 halMsg_GetHostWlanFeatCaps(tANI_U8 feat_enum_value); - -#define setFeatCaps(a,b) { tANI_U32 arr_index, bit_index; \ - if ((b)<=127) { \ - arr_index = (b)/32; \ - bit_index = (b)%32; \ - if(arr_index < 4) \ - (a)->featCaps[arr_index] |= (1<<bit_index); \ - } \ - } -#define getFeatCaps(a,b,c) { tANI_U32 arr_index, bit_index; \ - if ((b)<=127) { \ - arr_index = (b)/32; \ - bit_index = (b)%32; \ - (c) = ((a)->featCaps[arr_index] & (1<<bit_index))?1:0; \ - } \ - } -#define clearFeatCaps(a,b) { tANI_U32 arr_index, bit_index; \ - if ((b)<=127) { \ - arr_index = (b)/32; \ - bit_index = (b)%32; \ - (a)->featCaps[arr_index] &= ~(1<<bit_index); \ - } \ - } - -/*--------------------------------------------------------------------------- - * WLAN_HAL_WAKE_REASON_IND - *--------------------------------------------------------------------------*/ - -/* status codes to help debug rekey failures */ -typedef enum -{ - WLAN_HAL_GTK_REKEY_STATUS_SUCCESS = 0, - WLAN_HAL_GTK_REKEY_STATUS_NOT_HANDLED = 1, /* rekey detected, but not handled */ - WLAN_HAL_GTK_REKEY_STATUS_MIC_ERROR = 2, /* MIC check error on M1 */ - WLAN_HAL_GTK_REKEY_STATUS_DECRYPT_ERROR = 3, /* decryption error on M1 */ - WLAN_HAL_GTK_REKEY_STATUS_REPLAY_ERROR = 4, /* M1 replay detected */ - WLAN_HAL_GTK_REKEY_STATUS_MISSING_KDE = 5, /* missing GTK key descriptor in M1 */ - WLAN_HAL_GTK_REKEY_STATUS_MISSING_IGTK_KDE = 6, /* missing iGTK key descriptor in M1 */ - WLAN_HAL_GTK_REKEY_STATUS_INSTALL_ERROR = 7, /* key installation error */ - WLAN_HAL_GTK_REKEY_STATUS_IGTK_INSTALL_ERROR = 8, /* iGTK key installation error */ - WLAN_HAL_GTK_REKEY_STATUS_RESP_TX_ERROR = 9, /* GTK rekey M2 response TX error */ - - WLAN_HAL_GTK_REKEY_STATUS_GEN_ERROR = 255 /* non-specific general error */ -} tGTKRekeyStatus; - -/* wake reason types */ -typedef enum -{ - WLAN_HAL_WAKE_REASON_NONE = 0, - WLAN_HAL_WAKE_REASON_MAGIC_PACKET = 1, /* magic packet match */ - WLAN_HAL_WAKE_REASON_PATTERN_MATCH = 2, /* host defined pattern match */ - WLAN_HAL_WAKE_REASON_EAPID_PACKET = 3, /* EAP-ID frame detected */ - WLAN_HAL_WAKE_REASON_EAPOL4WAY_PACKET = 4, /* start of EAPOL 4-way handshake detected */ - WLAN_HAL_WAKE_REASON_NETSCAN_OFFL_MATCH = 5, /* network scan offload match */ - WLAN_HAL_WAKE_REASON_GTK_REKEY_STATUS = 6, /* GTK rekey status wakeup (see status) */ - WLAN_HAL_WAKE_REASON_BSS_CONN_LOST = 7, /* BSS connection lost */ -} tWakeReasonType; - -/* - Wake Packet which is saved at tWakeReasonParams.DataStart - This data is sent for any wake reasons that involve a packet-based wakeup : - - WLAN_HAL_WAKE_REASON_TYPE_MAGIC_PACKET - WLAN_HAL_WAKE_REASON_TYPE_PATTERN_MATCH - WLAN_HAL_WAKE_REASON_TYPE_EAPID_PACKET - WLAN_HAL_WAKE_REASON_TYPE_EAPOL4WAY_PACKET - WLAN_HAL_WAKE_REASON_TYPE_GTK_REKEY_STATUS - - The information is provided to the host for auditing and debug purposes - -*/ - -/* - Wake reason indication parameters -*/ -typedef PACKED_PRE struct PACKED_POST -{ - uint32 ulReason; /* see tWakeReasonType */ - uint32 ulReasonArg; /* argument specific to the reason type */ - uint32 ulStoredDataLen; /* length of optional data stored in this message, in case - HAL truncates the data (i.e. data packets) this length - will be less than the actual length */ - uint32 ulActualDataLen; /* actual length of data */ - uint8 aDataStart[1]; /* variable length start of data (length == storedDataLen) - see specific wake type */ -} tWakeReasonParams, *tpWakeReasonParams; - -/* - Wake reason indication -*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tWakeReasonParams wakeReasonParams; - tANI_U32 uBssIdx : 8; - tANI_U32 bReserved : 24; -} tHalWakeReasonInd, *tpHalWakeReasonInd; - -/*--------------------------------------------------------------------------- -* WLAN_HAL_GTK_OFFLOAD_REQ -*--------------------------------------------------------------------------*/ - -#define HAL_GTK_KEK_BYTES 16 -#define HAL_GTK_KCK_BYTES 16 - -#define WLAN_HAL_GTK_OFFLOAD_FLAGS_DISABLE (1 << 0) - -#define GTK_SET_BSS_KEY_TAG 0x1234AA55 - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 ulFlags; /* optional flags */ - tANI_U8 aKCK[HAL_GTK_KCK_BYTES]; /* Key confirmation key */ - tANI_U8 aKEK[HAL_GTK_KEK_BYTES]; /* key encryption key */ - tANI_U64 ullKeyReplayCounter; /* replay counter */ - tANI_U8 bssIdx; -} tHalGtkOffloadReqParams, *tpHalGtkOffloadReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalGtkOffloadReqParams gtkOffloadReqParams; -} tHalGtkOffloadReqMsg, *tpHalGtkOffloadReqMsg; - -/*--------------------------------------------------------------------------- -* WLAN_HAL_GTK_OFFLOAD_RSP -*--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 ulStatus; /* success or failure */ - tANI_U8 bssIdx; -} tHalGtkOffloadRspParams, *tpHalGtkOffloadRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalGtkOffloadRspParams gtkOffloadRspParams; -} tHalGtkOffloadRspMsg, *tpHalGtkOffloadRspMsg; - - -/*--------------------------------------------------------------------------- -* WLAN_HAL_GTK_OFFLOAD_GETINFO_REQ -*--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 bssIdx; - -} tHalGtkOffloadGetInfoReqParams, *tptHalGtkOffloadGetInfoReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalGtkOffloadGetInfoReqParams gtkOffloadGetInfoReqParams; -} tHalGtkOffloadGetInfoReqMsg, *tpHalGtkOffloadGetInfoReqMsg; - -/*--------------------------------------------------------------------------- -* WLAN_HAL_GTK_OFFLOAD_GETINFO_RSP -*--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 ulStatus; /* success or failure */ - tANI_U32 ulLastRekeyStatus; /* last rekey status when the rekey was offloaded */ - tANI_U64 ullKeyReplayCounter; /* current replay counter value */ - tANI_U32 ulTotalRekeyCount; /* total rekey attempts */ - tANI_U32 ulGTKRekeyCount; /* successful GTK rekeys */ - tANI_U32 ulIGTKRekeyCount; /* successful iGTK rekeys */ - tANI_U8 bssIdx; -} tHalGtkOffloadGetInfoRspParams, *tptHalGtkOffloadGetInfoRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalGtkOffloadGetInfoRspParams gtkOffloadGetInfoRspParams; -} tHalGtkOffloadGetInfoRspMsg, *tpHalGtkOffloadGetInfoRspMsg; - -/*--------------------------------------------------------------------------- -* WLAN_HAL_DHCP_IND -*--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*Indicates the device mode which indicates about the DHCP activity */ - tANI_U8 device_mode; - tSirMacAddr macAddr; -} tDHCPInfo, *tpDHCPInfo; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tANI_U32 status; /* success or failure */ -} tDHCPIndStatus, *tpDHCPIndstatus; - -/* - Thermal Mitigation mode of operation. - HAL_THERMAL_MITIGATION_MODE_0 - Based on AMPDU disabling aggregation - HAL_THERMAL_MITIGATION_MODE_1 - Based on AMPDU disabling aggregation and - reducing transmit power - HAL_THERMAL_MITIGATION_MODE_2 - Not supported -*/ -typedef enum -{ - HAL_THERMAL_MITIGATION_MODE_INVALID = -1, - HAL_THERMAL_MITIGATION_MODE_0, - HAL_THERMAL_MITIGATION_MODE_1, - HAL_THERMAL_MITIGATION_MODE_2, - HAL_THERMAL_MITIGATION_MODE_MAX = WLAN_HAL_MAX_ENUM_SIZE, -}tHalThermalMitigationModeType; -//typedef tANI_S16 tHalThermalMitigationModeType; - -/* - Thermal Mitigation level. - Note the levels are incremental i.e HAL_THERMAL_MITIGATION_LEVEL_2 = - HAL_THERMAL_MITIGATION_LEVEL_0 + HAL_THERMAL_MITIGATION_LEVEL_1 - - HAL_THERMAL_MITIGATION_LEVEL_0 - lowest level of thermal mitigation. This - level indicates normal mode of operation - HAL_THERMAL_MITIGATION_LEVEL_1 - 1st level of thermal mitigation - HAL_THERMAL_MITIGATION_LEVEL_2 - 2nd level of thermal mitigation - HAL_THERMAL_MITIGATION_LEVEL_3 - 3rd level of thermal mitigation - HAL_THERMAL_MITIGATION_LEVEL_4 - 4th level of thermal mitigation -*/ -typedef enum -{ - HAL_THERMAL_MITIGATION_LEVEL_INVALID = -1, - HAL_THERMAL_MITIGATION_LEVEL_0, - HAL_THERMAL_MITIGATION_LEVEL_1, - HAL_THERMAL_MITIGATION_LEVEL_2, - HAL_THERMAL_MITIGATION_LEVEL_3, - HAL_THERMAL_MITIGATION_LEVEL_4, - HAL_THERMAL_MITIGATION_LEVEL_MAX = WLAN_HAL_MAX_ENUM_SIZE, -}tHalThermalMitigationLevelType; -//typedef tANI_S16 tHalThermalMitigationLevelType; - -typedef PACKED_PRE struct PACKED_POST -{ - /* Thermal Mitigation Operation Mode */ - tHalThermalMitigationModeType thermalMitMode; - - /* Thermal Mitigation Level */ - tHalThermalMitigationLevelType thermalMitLevel; - -}tSetThermalMitgationType, *tpSetThermalMitgationType; - -/* WLAN_HAL_SET_THERMAL_MITIGATION_REQ */ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tSetThermalMitgationType thermalMitParams; -} tSetThermalMitigationReqMsg, *tpSetThermalMitigationReqMsg; - -typedef PACKED_PRE struct PACKED_POST{ - - tHalMsgHeader header; - - /*status of the request */ - tANI_U32 status; - -} tSetThermalMitigationResp, *tpSetThermalMitigationResp; - -/* Per STA Class B Statistics. Class B statistics are STA TX/RX stats -provided to FW from Host via periodic messages */ -typedef PACKED_PRE struct PACKED_POST { - /* TX stats */ - uint32 txBytesPushed; - uint32 txPacketsPushed; - - /* RX stats */ - uint32 rxBytesRcvd; - uint32 rxPacketsRcvd; - uint32 rxTimeTotal; -} tStaStatsClassB, *tpStaStatsClassB; - -typedef PACKED_PRE struct PACKED_POST { - - /* Duration over which this stats was collected */ - tANI_U32 duration; - - /* Per STA Stats */ - tStaStatsClassB staStatsClassB[HAL_NUM_STA]; -} tStatsClassBIndParams, *tpStatsClassBIndParams; - -typedef PACKED_PRE struct PACKED_POST { - - tHalMsgHeader header; - - /* Class B Stats */ - tStatsClassBIndParams statsClassBIndParams; -} tStatsClassBInd, *tpStatsClassBInd; - -/*Wifi Proximity paramters in AP mode*/ -#ifdef FEATURE_WIFI_PROXIMITY - -typedef PACKED_PRE struct PACKED_POST{ - - tANI_U8 wifiProximityChannel; - tANI_U32 wifiProximityDuration; - tANI_U32 wifiProximityInterval; - tANI_U32 wifiProximityMode; - tANI_U32 wifiProximityStatus; - tSirMacAddr bssId; - tSirMacSSid ssId; - -} tSetWifiProximityReqParam, *tpSetWifiProximityReqParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - - tSetWifiProximityReqParam wifiProximityReqParams; - -}tSetWifiProximityReqMsg, *tpSetWifiProximityReqMsg; - -/*WLAN_HAL_WIFI_PROXIMITY_RSP*/ -typedef PACKED_PRE struct PACKED_POST{ - - tHalMsgHeader header; - - /*status of the request */ - tANI_U32 status; - -} tSetWifiProximityRspMsg, *tpSetWifiProxmityRspMsg; - -#endif - -#ifdef FEATURE_SPECULATIVE_PS_POLL -/*--------------------------------------------------------------------------- - * WLAN_HAL_START_SPECULATIVE_PS_POLLS_REQ - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 bssIdx; - tANI_U16 serviceInterval; - tANI_U16 suspendInterval; - tANI_U8 acMask; -} tHalStartSpecPsPollReqParams, *tpHalStartSpecPsPollReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalStartSpecPsPollReqParams specPsPollReq; -} tHalStartSpecPsPollReqMsg, *tpHalStartSpecPsPollReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_START_SPECULATIVE_PS_POLLS_RSP - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - tANI_U8 bssIdx; -} tHalStartSpecPsPollRspParams, *tpHalStartSpecPsPollRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalStartSpecPsPollRspParams startSpecPsPollRspParams; -} tHalStartSpecPsPollRspMsg, *tpHalStartSpecPsPollRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_STOP_SPECULATIVE_PS_POLLS_IND - *--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tANI_U8 bssIdx; -} tHalStopSpecPsPollsIndMsg, *tpHalStopSpecPsPollsIndMsg; -#endif - -#ifdef FEATURE_WLAN_TDLS -#define HAL_MAX_SUPP_CHANNELS 128 -#define HAL_MAX_SUPP_OPER_CLASSES 32 -/*--------------------------------------------------------------------------- - * WLAN_HAL_TDLS_LINK_ESTABLISHED_REQ - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*STA Index*/ - tANI_U16 staIdx; - - /* if this is 1, self is initiator and peer is reponder */ - tANI_U8 bIsResponder; - - /* QoS Info */ - tANI_U8 acVOUAPSDFlag:1; - tANI_U8 acVIUAPSDFlag:1; - tANI_U8 acBKUAPSDFlag:1; - tANI_U8 acBEUAPSDFlag:1; - tANI_U8 aAck:1; - tANI_U8 maxServicePeriodLength:2; - tANI_U8 moreDataAck:1; - - /*TDLS Peer U-APSD Buffer STA Support*/ - tANI_U8 TPUBufferStaSupport; - - /*TDLS off channel related params */ - tANI_U8 tdlsOffChannelSupport; - tANI_U8 peerCurrOperClass; - tANI_U8 selfCurrOperClass; - tANI_U8 validChannelsLen; - tANI_U8 validChannels[HAL_MAX_SUPP_CHANNELS]; - tANI_U8 validOperClassesLen; - tANI_U8 validOperClasses[HAL_MAX_SUPP_OPER_CLASSES]; -}tTDLSLinkEstablishedType, *tpTDLSLinkEstablishedType; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTDLSLinkEstablishedType tdlsLinkEstablishedParams; -} tTDLSLinkEstablishedReqMsg, *tpTDLSLinkEstablishedReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_TDLS_LINK_ESTABLISHED_RSP - *-------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 status; - - /*STA Index*/ - tANI_U16 staIdx; -} tTDLSLinkEstablishedResp, *tpTDLSLinkEstablishedResp; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTDLSLinkEstablishedResp TDLSLinkEstablishedRespParams; -} tTDLSLinkEstablishedRespMsg, *tpTDLSLinkEstablishedRespMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_TDLS_LINK_TEARDOWN_REQ - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /*STA Index*/ - tANI_U16 staIdx; -}tTDLSLinkTeardownType, *tpTDLSLinkTeardownType; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTDLSLinkTeardownType tdlsLinkTeardownParams; -} tTDLSLinkTeardownReqMsg, *tpTDLSLinkTeardownReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_TDLS_LINK_TEARDOWN_RSP - *-------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 status; - - /*STA Index*/ - tANI_U16 staIdx; -} tTDLSLinkTeardownResp, *tpTDLSLinkTeardownResp; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTDLSLinkTeardownResp TDLSLinkTeardownRespParams; -} tTDLSLinkTeardownRespMsg, *tpTDLSLinkTeardownRespMsg; - -/*--------------------------------------------------------------------------- - *WLAN_HAL_TDLS_IND - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U16 assocId; - tANI_U16 staIdx; - tANI_U16 status; - tANI_U16 reasonCode; -}tTdlsIndParams, *tpTdlsIndParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTdlsIndParams tdlsIndParams; -}tTdlsIndMsg, *tpTdlsIndMsg; - -#endif - -/*--------------------------------------------------------------------------- - *WLAN_HAL_IBSS_PEER_INACTIVITY_IND - *--------------------------------------------------------------------------*/ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 bssIdx; - tANI_U8 staIdx; - tSirMacAddr staAddr; -}tIbssPeerInactivityIndParams, *tpIbssPeerInactivityIndParams; - - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tIbssPeerInactivityIndParams ibssPeerInactivityIndParams; -}tIbssPeerInactivityIndMsg, *tpIbssPeerInactivityIndMsg; - - -/*********** Scan Offload Related Structures *************/ -#define HAL_NUM_SCAN_SSID 10 -#define HAL_NUM_SCAN_BSSID 4 - -/* - * Enumetation to indicate scan type (active/passive) - */ -typedef enum -{ - eSIR_PASSIVE_SCAN, - eSIR_ACTIVE_SCAN = WLAN_HAL_MAX_ENUM_SIZE, -} tSirScanType; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 numBssid; - tSirMacAddr bssid[HAL_NUM_SCAN_BSSID]; - tANI_U8 numSsid; - tSirMacSSid ssid[HAL_NUM_SCAN_SSID]; - tANI_BOOLEAN hiddenSsid; - tSirMacAddr selfMacAddr; - tSirBssType bssType; - tSirScanType scanType; - tANI_U32 minChannelTime; - tANI_U32 maxChannelTime; - tANI_BOOLEAN p2pSearch; - tANI_U8 channelCount; - tANI_U8 channels[WLAN_HAL_ROAM_SCAN_MAX_CHANNELS]; - tANI_U16 ieFieldLen; - tANI_U8 ieField[1]; -}tScanOffloadReqType, *tpScanOffloadReqType; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_START_SCAN_OFFLOAD_REQ - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tScanOffloadReqType scanOffloadParams; -} tHalStartScanOffloadReqMsg, *tpHalStartScanOffloadReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_START_SCAN_OFFLOAD_RSP - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - - /*status of the request - just to indicate SO has acknowledged - * * the request and will start scanning*/ - tANI_U32 status; -} tHalStartScanOffloadRspMsg, *tpHalStartScanOffloadRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_STOP_SCAN_OFFLOAD_REQ - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; -} tHalStopScanOffloadReqMsg, *tpHalStopScanOffloadReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_STOP_SCAN_OFFLOAD_RSP - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - - /*status of the request - just to indicate SO has acknowledged - the request and will start scanning*/ - tANI_U32 status; -} tHalStopScanOffloadRspMsg, *tpHalStopScanOffloadRspMsg; - -/* - * Enumetation of scan events indicated by firmware to the host - */ -typedef enum -{ - WLAN_HAL_SCAN_EVENT_STARTED = 0x1, /* Scan command accepted by FW */ - WLAN_HAL_SCAN_EVENT_COMPLETED = 0x2, /* Scan has been completed by FW */ - WLAN_HAL_SCAN_EVENT_BSS_CHANNEL = 0x4, /* FW is going to move to HOME channel */ - WLAN_HAL_SCAN_EVENT_FOREIGN_CHANNEL = 0x8,/* FW is going to move to FORIEGN channel */ - WLAN_HAL_SCAN_EVENT_DEQUEUED = 0x10, /* scan request got dequeued */ - WLAN_HAL_SCAN_EVENT_PREEMPTED = 0x20, /* preempted by other high priority scan */ - WLAN_HAL_SCAN_EVENT_START_FAILED = 0x40, /* scan start failed */ - WLAN_HAL_SCAN_EVENT_RESTARTED = 0x80, /*scan restarted*/ - WLAN_HAL_SCAN_EVENT_MAX = WLAN_HAL_MAX_ENUM_SIZE -} tScanEventType; - -typedef PACKED_PRE struct PACKED_POST -{ - tScanEventType event; - tANI_U32 channel; - tANI_U32 scanId; -} tScanOffloadEventInfo; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_OFFLOAD_SCAN_EVENT_IND - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tScanOffloadEventInfo scanOffloadInd; -} tHalScanOffloadIndMsg, *tpHalScanOffloadIndMsg; - -typedef PACKED_PRE struct PACKED_POST { - /** primary 20 MHz channel frequency in mhz */ - tANI_U32 mhz; - /** Center frequency 1 in MHz*/ - tANI_U32 band_center_freq1; - /** Center frequency 2 in MHz - valid only for 11acvht 80plus80 mode*/ - tANI_U32 band_center_freq2; - /* The first 26 bits are a bit mask to indicate any channel flags, - (see WLAN_HAL_CHAN_FLAG*) - The last 6 bits indicate the mode (see tChannelPhyModeType)*/ - tANI_U32 channel_info; - /** contains min power, max power, reg power and reg class id. */ - tANI_U32 reg_info_1; - /** contains antennamax */ - tANI_U32 reg_info_2; -} tUpdateChannelParam; - - -typedef enum { - WLAN_HAL_MODE_11A = 0, /* 11a Mode */ - WLAN_HAL_MODE_11G = 1, /* 11b/g Mode */ - WLAN_HAL_MODE_11B = 2, /* 11b Mode */ - WLAN_HAL_MODE_11GONLY = 3, /* 11g only Mode */ - WLAN_HAL_MODE_11NA_HT20 = 4, /* 11a HT20 mode */ - WLAN_HAL_MODE_11NG_HT20 = 5, /* 11g HT20 mode */ - WLAN_HAL_MODE_11NA_HT40 = 6, /* 11a HT40 mode */ - WLAN_HAL_MODE_11NG_HT40 = 7, /* 11g HT40 mode */ - WLAN_HAL_MODE_11AC_VHT20 = 8, - WLAN_HAL_MODE_11AC_VHT40 = 9, - WLAN_HAL_MODE_11AC_VHT80 = 10, - WLAN_HAL_MODE_11AC_VHT20_2G = 11, - WLAN_HAL_MODE_11AC_VHT40_2G = 12, - WLAN_HAL_MODE_11AC_VHT80_2G = 13, - WLAN_HAL_MODE_UNKNOWN = 14, - -} tChannelPhyModeType; - -#define WLAN_HAL_CHAN_FLAG_HT40_PLUS 6 -#define WLAN_HAL_CHAN_FLAG_PASSIVE 7 -#define WLAN_HAL_CHAN_ADHOC_ALLOWED 8 -#define WLAN_HAL_CHAN_AP_DISABLED 9 -#define WLAN_HAL_CHAN_FLAG_DFS 10 -#define WLAN_HAL_CHAN_FLAG_ALLOW_HT 11 /* HT is allowed on this channel */ -#define WLAN_HAL_CHAN_FLAG_ALLOW_VHT 12 /* VHT is allowed on this channel */ - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 numChan; - tUpdateChannelParam chanParam[WLAN_HAL_ROAM_SCAN_MAX_CHANNELS]; -} tUpdateChannelReqType; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_UPDATE_CHANNEL_LIST_REQ - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tUpdateChannelReqType updateChannelParams; -} tHalUpdateChannelReqMsg, *tpHalUpdateChannelReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_UPDATE_CHANNEL_LIST_RSP - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - - /*status of the request - just to indicate SO has acknowledged - * * the request and will start scanning*/ - tANI_U32 status; -} tHalUpdateChannelRspMsg, *tpHalUpdateChannelRspMsg; - - -/*--------------------------------------------------------------------------- - * WLAN_HAL_LBP_LEADER_REQ - *-------------------------------------------------------------------------*/ - -/* Maximum number of RMCAST sessions in each role (transmitter or Leader) */ -#define HAL_MAX_RMCAST_SESSIONS 2 - -/* Maximum number of leaders in blacklist or candidate leader list */ -#define HAL_NUM_MAX_LEADERS 8 - -typedef enum -{ - WLAN_HAL_SUGGEST_LEADER, - WLAN_HAL_BECOME_LEADER, - WLAN_HAL_LEADER_CMD_MAX = WLAN_HAL_MAX_ENUM_SIZE -}tLeaderReqCmdType, tLeaderRspCmdType; - -typedef PACKED_PRE struct PACKED_POST -{ - tLeaderReqCmdType cmd; - - /* MAC address of MCAST Transmitter (source) */ - tSirMacAddr mcastTransmitter; - - /* MAC Address of Multicast Group (01-00-5E-xx-xx-xx) */ - tSirMacAddr mcastGroup; - - /* Optional black list for cmd = WLAN_HAL_SUGGEST_LEADER */ - tSirMacAddr blacklist[HAL_NUM_MAX_LEADERS]; -} tHalLbpLeaderReqParams, *tpHalLbpLeaderReqParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalLbpLeaderReqParams leaderReqParams; -} tHalLbpLeaderReqMsg, *tpHalLbpLeaderReqMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_LBP_LEADER_RSP - *-------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - /* success or failure */ - tANI_U32 status; - - /* Command Type */ - tLeaderRspCmdType cmd; - - /* MAC address of MCAST Transmitter (source) */ - tSirMacAddr mcastTransmitter; - - /* MAC Address of Multicast Group (01-00-5E-xx-xx-xx) */ - tSirMacAddr mcastGroup; - - /* List of candidates for cmd = WLAN_HAL_SUGGEST_LEADER*/ - tSirMacAddr leader[HAL_NUM_MAX_LEADERS]; - -} tHalLbpLeaderRspParams, *tpHalLbpLeaderRspParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalLbpLeaderRspParams leaderRspParams; -} tHalLbpLeaderRspMsg, *tpHalLbpLeaderRspMsg; - -/*--------------------------------------------------------------------------- - * WLAN_HAL_LBP_UPDATE_IND - *-------------------------------------------------------------------------*/ -typedef enum -{ - WLAN_HAL_LEADER_ACCEPTED, //Host-->FW - WLAN_HAL_LEADER_CANCELED, //Host-->FW - WLAN_HAL_LEADER_PICK_NEW, //FW-->Host - WLAN_HAL_LEADER_IND_MAX = WLAN_HAL_MAX_ENUM_SIZE -}tLbpUpdateIndType; - -typedef enum -{ - WLAN_HAL_LBP_LEADER_ROLE, - WLAN_HAL_LBP_TRANSMITTER_ROLE, - WLAN_HAL_LBP_ROLE_MAX = WLAN_HAL_MAX_ENUM_SIZE -}tLbpRoleType; - -typedef PACKED_PRE struct PACKED_POST -{ - tLbpUpdateIndType indication; - - /* Role of the entity generating this indication */ - tLbpRoleType role; - - /* MAC address of MCAST Transmitter (source) */ - tSirMacAddr mcastTransmitter; - - /* MAC Address of Multicast Group (01-00-5E-xx-xx-xx) */ - tSirMacAddr mcastGroup; - - /* MAC address of MCAST Receiver Leader */ - tSirMacAddr mcastLeader; - - /* Candidate list for indication = WLAN_HAL_LEADER_PICK_NEW */ - tSirMacAddr leader[HAL_NUM_MAX_LEADERS]; -} tHalLbpUpdateIndParams, *tpHalLbpUpdateIndParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalLbpUpdateIndParams leaderIndParams; -} tHalLbpUpdateInd, *tpHalLbpUpdateInd; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 staIdx; // Station Idx; - tANI_U32 txRate; // Legacy transmit rate, in units of 500 kbit/sec, - // for the most recently transmitted frame - tANI_U32 mcsIndex; // mcs index for HT20 and HT40 rates - tANI_U32 txRateFlags; // to differentiate between HT20 and - // HT40 rates; short and long guard interval - tANI_S8 rssi; // RSSI of the last received beacon -}tHalIbssPeerParams, *tpHalIbssPeerParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U32 status; // success or failure - tANI_U8 numOfPeers; // Number of Peers for - // which stats are being reported - tHalIbssPeerParams ibssPeerParams[1]; // Stats of peer in IBSS -}tHalIbssPeerInfoRspParams, *tpHalIbssPeerInfoRspParams; - -// WLAN_HAL_GET_IBSS_PEER_INFO_RSP -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalIbssPeerInfoRspParams ibssPeerInfoRspParams; -}tHalIbssPeerInfoRsp, *tpHalIbssPeerInfoRsp; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 bssIdx; // Bss Index - tANI_BOOLEAN allPeerInfoReqd; // If set, all IBSS peers stats are reported - tANI_U8 staIdx; // If allPeerInfoReqd is not set, - // only stats of peer with - // staIdx is reported -}tHalIbssPeerInfoReqParams, *tpHalIbssPeerInfoReqParams; - -// WLAN_HAL_GET_IBSS_PEER_INFO_REQ -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalIbssPeerInfoReqParams ibssPeerInfoReqParams; -}tHalIbssPeerInfoReq, *tpHalIbssPeerInfoReq; - -/*--------------------------------------------------------------------------- - WLAN_HAL_RATE_UPDATE_IND - *-------------------------------------------------------------------------*/ - typedef PACKED_PRE struct PACKED_POST -{ - /* 0 implies UCAST RA, positive value implies fixed rate, -1 implies ignore this param */ - tANI_S32 ucastDataRate; //unit Mbpsx10 - - /* TX flag to differentiate between HT20, HT40 etc */ - tTxRateInfoFlags ucastDataRateTxFlag; - - /* BSSID - Optional. 00-00-00-00-00-00 implies apply to all BCAST STAs */ - tSirMacAddr bssid; - - /* 0 implies MCAST RA, positive value implies fixed rate, -1 implies ignore */ - tANI_S32 reliableMcastDataRate; //unit Mbpsx10 - - /* TX flag to differentiate between HT20, HT40 etc */ - tTxRateInfoFlags reliableMcastDataRateTxFlag; - - /* Default (non-reliable) MCAST(or BCAST) fixed rate in 2.4 GHz, 0 implies ignore */ - tANI_U32 mcastDataRate24GHz; //unit Mbpsx10 - - /* TX flag to differentiate between HT20, HT40 etc */ - tTxRateInfoFlags mcastDataRate24GHzTxFlag; - - /* Default (non-reliable) MCAST(or BCAST) fixed rate in 5 GHz, 0 implies ignore */ - tANI_U32 mcastDataRate5GHz; //unit Mbpsx10 - - /* TX flag to differentiate between HT20, HT40 etc */ - tTxRateInfoFlags mcastDataRate5GHzTxFlag; - -} tHalRateUpdateParams, *tpHalRateUpdateParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalRateUpdateParams halRateUpdateParams; -} tHalRateUpdateInd, * tpHalRateUpdateInd; - -/*--------------------------------------------------------------------------- -* WLAN_HAL_TX_FAIL_IND -*--------------------------------------------------------------------------*/ -// Northbound indication from FW to host on weak link detection -typedef PACKED_PRE struct PACKED_POST -{ - // Sequence number increases by 1 whenever the device driver - // sends a notification event. This is cleared as 0 when the - // JOIN IBSS commamd is issued - tANI_U16 seqNo; - tANI_U16 staId; - tANI_U8 macAddr[HAL_MAC_ADDR_LEN]; -} tHalTXFailIndParams, *tpHalTXFailIndParams; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tHalTXFailIndParams txFailIndParams; -} tHalTXFailIndMsg, *tpHalTXFailIndMsg; - -/*--------------------------------------------------------------------------- -* WLAN_HAL_TX_FAIL_MONITOR_IND -*--------------------------------------------------------------------------*/ -// Southbound message from Host to monitor the Tx failures -typedef PACKED_PRE struct PACKED_POST -{ - // tx_fail_count = 0 should disable the TX Fail monitor, non-zero value should enable it. - tANI_U8 tx_fail_count; -} tTXFailMonitorInfo, *tpTXFailMonitorInfo; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tTXFailMonitorInfo txFailMonitor; -} tTXFailMonitorInd, *tpTXFailMonitorInd; - -/*--------------------------------------------------------------------------- -* WLAN_HAL_IP_FORWARD_TABLE_UPDATE_IND -*--------------------------------------------------------------------------*/ -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 destIpv4Addr[HAL_IPV4_ADDR_LEN]; - tANI_U8 nextHopMacAddr[HAL_MAC_ADDR_LEN]; -} tDestIpNextHopMacPair; - -typedef PACKED_PRE struct PACKED_POST -{ - tANI_U8 numEntries; - tDestIpNextHopMacPair destIpMacPair[1]; -} tWlanIpForwardTableUpdateIndParam; - -typedef PACKED_PRE struct PACKED_POST -{ - tHalMsgHeader header; - tWlanIpForwardTableUpdateIndParam ipForwardTableParams; -} tWlanIpForwardTableUpdateInd; - -/*--------------------------------------------------------------------------- - *-------------------------------------------------------------------------*/ - -#if defined(__ANI_COMPILER_PRAGMA_PACK_STACK) -#pragma pack(pop) -#elif defined(__ANI_COMPILER_PRAGMA_PACK) -#else -#endif - -#endif /* _WLAN_HAL_MSG_H_ */ - |