Pass TDLS Peer Capabilities for Rate Adaptation
Firmware needs the capabilities of the peer to implement the RA.
Update the peer's capabilities as part of the change station
from the supplicant.
Change-Id: Ic16ce5e58d4b96c9b49f24a6141e39ae786a6dce
CRs-fixed: 452921
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 1dc994a..4952ff5 100755
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1895,6 +1895,7 @@
roamResult == eCSR_ROAM_RESULT_DELETE_TDLS_PEER ? "DEL_TDLS_PEER" :
roamResult == eCSR_ROAM_RESULT_TEARDOWN_TDLS_PEER_IND ? "DEL_TDLS_PEER_IND" :
roamResult == eCSR_ROAM_RESULT_DELETE_ALL_TDLS_PEER_IND? "DEL_ALL_TDLS_PEER_IND" :
+ roamResult == eCSR_ROAM_RESULT_UPDATE_TDLS_PEER? "UPDATE_TDLS_PEER" :
"UNKNOWN",
pRoamInfo->staId,
pRoamInfo->peerMac[0],
@@ -1966,6 +1967,20 @@
complete(&pAdapter->tdls_add_station_comp);
break ;
}
+ case eCSR_ROAM_RESULT_UPDATE_TDLS_PEER:
+ {
+ if (eSIR_SME_SUCCESS != pRoamInfo->statusCode)
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: Add Sta is failed. %d", __func__, pRoamInfo->statusCode);
+ }
+ /* store the ucast signature which will be used later when
+ * registering to TL
+ */
+ pAdapter->tdlsAddStaStatus = pRoamInfo->statusCode;
+ complete(&pAdapter->tdls_add_station_comp);
+ break;
+ }
case eCSR_ROAM_RESULT_DELETE_TDLS_PEER:
{
for ( staIdx = 0; staIdx < HDD_MAX_NUM_TDLS_STA; staIdx++ )
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 11c974d..42a87f6 100755
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -2670,6 +2670,106 @@
return 0;
}
+#ifdef FEATURE_WLAN_TDLS
+static int wlan_hdd_tdls_add_station(struct wiphy *wiphy,
+ struct net_device *dev, u8 *mac, bool update, tCsrStaParams *StaParams)
+{
+ hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
+ hdd_context_t *pHddCtx = wiphy_priv(wiphy);
+ VOS_STATUS status;
+
+ ENTER();
+
+ if (NULL == pHddCtx || NULL == pHddCtx->cfg_ini)
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "Invalid arguments");
+ return -EINVAL;
+ }
+ if (pHddCtx->isLogpInProgress)
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s:LOGP in Progress. Ignore!!!", __func__);
+ return -EBUSY;
+ }
+
+ if (FALSE == pHddCtx->cfg_ini->fEnableTDLSSupport ||
+ FALSE == sme_IsFeatureSupportedByFW(TDLS))
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "TDLS Disabled in INI OR not enabled in FW.\
+ Cannot process TDLS commands \n");
+ return -ENOTSUPP;
+ }
+
+ if (wlan_hdd_tdls_is_progress(pAdapter, mac, TRUE))
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "%s: TDLS setup is ongoing. Request declined.",__func__);
+ return -EPERM;
+ }
+
+ /* first to check if we reached to maximum supported TDLS peer.
+ TODO: for now, return -EPERM looks working fine,
+ but need to check if any other errno fit into this category.*/
+ if (HDD_MAX_NUM_TDLS_STA <= wlan_hdd_tdlsConnectedPeers(pAdapter))
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "%s: TDLS Max peer already connected. Request declined. \n",
+ __func__);
+ return -EPERM;
+ }
+ else
+ {
+ hddTdlsPeer_t *pTdlsPeer;
+ pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, mac);
+ if (pTdlsPeer && (eTDLS_LINK_CONNECTED == pTdlsPeer->link_status))
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "%s: %02x:%02x:%02x:%02x:%02x:%02x already connected. Request declined.",
+ __func__, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+ return -EPERM;
+ }
+ }
+
+ wlan_hdd_tdls_set_link_status(pAdapter, mac, eTDLS_LINK_CONNECTING);
+
+ INIT_COMPLETION(pAdapter->tdls_add_station_comp);
+
+ if (!update)
+ {
+ status = sme_AddTdlsPeerSta(WLAN_HDD_GET_HAL_CTX(pAdapter),
+ pAdapter->sessionId, mac);
+ }
+ else
+ {
+ status = sme_ChangeTdlsPeerSta(WLAN_HDD_GET_HAL_CTX(pAdapter),
+ pAdapter->sessionId, mac, StaParams);
+ }
+
+ status = wait_for_completion_interruptible_timeout(&pAdapter->tdls_add_station_comp,
+ msecs_to_jiffies(WAIT_TIME_TDLS_ADD_STA));
+
+ if (!status)
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "%s: timeout waiting for tdls add station indication",
+ __func__);
+ wlan_hdd_tdls_set_link_status(pAdapter, mac, eTDLS_LINK_IDLE);
+ return -EPERM;
+ }
+ if ( eHAL_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus)
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "%s: Add Station is unsucessful", __func__);
+ wlan_hdd_tdls_set_link_status(pAdapter, mac, eTDLS_LINK_IDLE);
+ return -EPERM;
+ }
+
+ return 0;
+}
+#endif
+
static int wlan_hdd_change_station(struct wiphy *wiphy,
struct net_device *dev,
u8 *mac,
@@ -2678,7 +2778,9 @@
VOS_STATUS status = VOS_STATUS_SUCCESS;
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( dev );
v_MACADDR_t STAMacAddress;
-
+ tCsrStaParams StaParams = {0};
+ u32 set;
+ tANI_U8 isBufSta = 0;
ENTER();
if ( (WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress )
@@ -2690,20 +2792,120 @@
vos_mem_copy(STAMacAddress.bytes, mac, sizeof(v_MACADDR_t));
- if ( ( pAdapter->device_mode == WLAN_HDD_SOFTAP )
- || ( pAdapter->device_mode == WLAN_HDD_P2P_GO )
- )
+ StaParams.capability = params->capability;
+ StaParams.uapsd_queues = params->uapsd_queues;
+ StaParams.max_sp = params->max_sp;
+
+ if (0 != params->ext_capab_len)
+ vos_mem_copy(StaParams.extn_capability, params->ext_capab,
+ sizeof(StaParams.extn_capability));
+
+ if (NULL != params->ht_capa)
+ vos_mem_copy(&StaParams.HTCap, params->ht_capa, sizeof(tSirHTCap));
+
+ StaParams.supported_rates_len = params->supported_rates_len;
+
+ /* Note : The Maximum sizeof supported_rates sent by the Supplicant is 32.
+ * The supported_rates array , for all the structures propogating till Add Sta
+ * to the firmware has to be modified , if the supplicant (ieee80211) is
+ * modified to send more rates.
+ */
+
+ /* To avoid Data Currption , set to max length to SIR_MAC_MAX_SUPP_RATES
+ */
+ if (StaParams.supported_rates_len > SIR_MAC_MAX_SUPP_RATES)
+ StaParams.supported_rates_len = SIR_MAC_MAX_SUPP_RATES;
+
+ if (0 != StaParams.supported_rates_len) {
+ int i = 0;
+ vos_mem_copy(StaParams.supported_rates, params->supported_rates,
+ StaParams.supported_rates_len);
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "Supported Rates with Length %d", StaParams.supported_rates_len);
+ for (i=0; i < StaParams.supported_rates_len; i++)
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "[%d]: %0x", i, StaParams.supported_rates[i]);
+ }
+
+ if (NULL != params->vht_capa)
+ vos_mem_copy(&StaParams.VHTCap, params->vht_capa, sizeof(tSirVHTCap));
+
+ set = params->sta_flags_set;
+
+ if ((pAdapter->device_mode == WLAN_HDD_SOFTAP)
+ || (pAdapter->device_mode == WLAN_HDD_P2P_GO))
{
- if(params->sta_flags_set & BIT(NL80211_STA_FLAG_AUTHORIZED))
+ if (params->sta_flags_set & BIT(NL80211_STA_FLAG_AUTHORIZED))
{
status = hdd_softap_change_STA_state( pAdapter, &STAMacAddress,
WLANTL_STA_AUTHENTICATED);
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,
- "%s: Station MAC address does not matching", __func__);
+ "%s: Station MAC address does not matching", __func__);
return -EINVAL;
}
}
+ else if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION ) {
+ if (set & BIT(NL80211_STA_FLAG_TDLS_PEER)) {
+ if (0 != params->ext_capab_len ) {
+ /*Define A Macro : TODO Sunil*/
+ if ((1<<4) & StaParams.extn_capability[3]) {
+ isBufSta = 1;
+ }
+ }
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "%s: TDLS Peer Parameters.", __func__);
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "uapsd_queues: %0x\n", params->uapsd_queues);
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "max_sp: %0x\n", params->max_sp);
+ if (params->ht_capa) {
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "ht_capa->cap_info: %0x\n", params->ht_capa->cap_info);
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "ht_capa->ampdu_params_info: %0x\n",
+ params->ht_capa->ampdu_params_info);
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "ht_capa->extended_capabilities: %0x\n",
+ params->ht_capa->extended_ht_cap_info);
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "ht_capa->tx_BF_cap_info: %0x\n",
+ params->ht_capa->tx_BF_cap_info);
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "ht_capa->antenna_selection_info: %0x\n",
+ params->ht_capa->antenna_selection_info);
+ }
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "params->capability: %0x\n",params->capability);
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "params->ext_capab_len: %0x\n",params->ext_capab_len);
+ if (0 != params->ext_capab_len )
+ {
+ int i =0;
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "Extended capabilities:");
+ for (i=0; i < params->ext_capab_len; i++)
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "[%d]: %0x", i, params->ext_capab[i]);
+ }
+ //status = wlan_hdd_tdls_set_peer_caps( mac, params->uapsd_queues,
+ // params->max_sp, isBufSta);
+ if (VOS_STATUS_SUCCESS != status) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: wlan_hdd_tdls_set_peer_caps failed!", __func__);
+ return -EINVAL;
+ }
+ VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
+ "ht_capa->cap_info: %0x\n", StaParams.HTCap.capInfo);
+ status = wlan_hdd_tdls_add_station(wiphy, dev, mac, 1, &StaParams);
+
+ if (VOS_STATUS_SUCCESS != status) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: sme_ChangeTdlsPeerSta failed!", __func__);
+ return -EINVAL;
+ }
+ }
+ }
EXIT();
return status;
@@ -4045,9 +4247,9 @@
hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d\n",
__func__,pAdapter->device_mode);
- if( (WLAN_HDD_INFRA_STATION == pAdapter->device_mode) &&
+ if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) &&
(eConnectionState_Connecting ==
- (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState) )
+ (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState))
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: %p(%d) Connection in progress: Scan request denied (EBUSY)", __func__, \
@@ -4057,7 +4259,7 @@
#ifdef WLAN_BTAMP_FEATURE
//Scan not supported when AMP traffic is on.
- if( VOS_TRUE == WLANBAP_AmpSessionOn() )
+ if (VOS_TRUE == WLANBAP_AmpSessionOn())
{
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: No scanning when AMP is on", __func__);
@@ -4065,9 +4267,9 @@
}
#endif
//Scan on any other interface is not supported.
- if( pAdapter->device_mode == WLAN_HDD_SOFTAP )
+ if (pAdapter->device_mode == WLAN_HDD_SOFTAP)
{
- hddLog(VOS_TRACE_LEVEL_ERROR,
+ hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: Not scanning on device_mode = %d",
__func__, pAdapter->device_mode);
return -EOPNOTSUPP;
@@ -4076,7 +4278,7 @@
if (TRUE == pScanInfo->mScanPending)
{
hddLog(VOS_TRACE_LEVEL_INFO, "%s: mScanPending is TRUE", __func__);
- return -EBUSY;
+ return -EBUSY;
}
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
@@ -4096,11 +4298,35 @@
//Channel and action frame is pending
//Otherwise Cancel Remain On Channel and allow Scan
//If no action frame pending
- if(0 != wlan_hdd_check_remain_on_channel(pAdapter))
+ if (0 != wlan_hdd_check_remain_on_channel(pAdapter))
{
hddLog(VOS_TRACE_LEVEL_INFO, "%s: Remain On Channel Pending", __func__);
return -EBUSY;
}
+#ifdef FEATURE_WLAN_TDLS
+ if (wlan_hdd_tdlsConnectedPeers(pAdapter))
+ {
+ tANI_U8 staIdx;
+
+ for (staIdx = 0; staIdx < HDD_MAX_NUM_TDLS_STA; staIdx++)
+ {
+ if (pHddCtx->tdlsConnInfo[staIdx].staId)
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ ("scan: indicate TDLS teadown (staId %d)"), pHddCtx->tdlsConnInfo[staIdx].staId) ;
+
+#ifdef CONFIG_TDLS_IMPLICIT
+ cfg80211_tdls_oper_request(pAdapter->dev,
+ pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes,
+ NL80211_TDLS_TEARDOWN,
+ eSIR_MAC_TDLS_TEARDOWN_UNSPEC_REASON,
+ GFP_KERNEL);
+#endif
+ }
+ }
+ return -EBUSY;
+ }
+#endif
if (mutex_lock_interruptible(&pHddCtx->tmInfo.tmOperationLock))
{
@@ -6275,98 +6501,6 @@
return 0;
}
-#ifdef FEATURE_WLAN_TDLS
-static int wlan_hdd_tdls_add_station(struct wiphy *wiphy,
- struct net_device *dev, u8 *mac)
-{
- hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_context_t *pHddCtx = wiphy_priv(wiphy);
- VOS_STATUS status;
-
- ENTER();
-
- if (NULL == pHddCtx || NULL == pHddCtx->cfg_ini)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "Invalid arguments");
- return -EINVAL;
- }
- if (pHddCtx->isLogpInProgress)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s:LOGP in Progress. Ignore!!!", __func__);
- return -EBUSY;
- }
-
- if (FALSE == pHddCtx->cfg_ini->fEnableTDLSSupport ||
- FALSE == sme_IsFeatureSupportedByFW(TDLS))
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "TDLS Disabled in INI OR not enabled in FW.\
- Cannot process TDLS commands \n");
- return -ENOTSUPP;
- }
-
- if (wlan_hdd_tdls_is_progress(pAdapter, mac, TRUE))
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
- "%s: TDLS setup is ongoing. Request declined.",__func__);
- return -EPERM;
- }
-
- /* first to check if we reached to maximum supported TDLS peer.
- TODO: for now, return -EPERM looks working fine,
- but need to check if any other errno fit into this category.*/
- if (HDD_MAX_NUM_TDLS_STA <= wlan_hdd_tdlsConnectedPeers(pAdapter))
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
- "%s: TDLS Max peer already connected. Request declined. \n",
- __func__);
- return -EPERM;
- }
- else
- {
- hddTdlsPeer_t *pTdlsPeer;
- pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, mac);
- if (pTdlsPeer && (eTDLS_LINK_CONNECTED == pTdlsPeer->link_status))
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
- "%s: %02x:%02x:%02x:%02x:%02x:%02x already connected. Request declined.",
- __func__, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
- return -EPERM;
- }
- }
-
- wlan_hdd_tdls_set_link_status(pAdapter, mac, eTDLS_LINK_CONNECTING);
-
- INIT_COMPLETION(pAdapter->tdls_add_station_comp);
-
- status = sme_AddTdlsPeerSta(WLAN_HDD_GET_HAL_CTX(pAdapter),
- pAdapter->sessionId, mac);
-
- status = wait_for_completion_interruptible_timeout(&pAdapter->tdls_add_station_comp,
- msecs_to_jiffies(WAIT_TIME_TDLS_ADD_STA));
-
- if (!status)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
- "%s: timeout waiting for tdls add station indication",
- __func__);
- wlan_hdd_tdls_set_link_status(pAdapter, mac, eTDLS_LINK_IDLE);
- return -EPERM;
- }
- if ( eHAL_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
- "%s: Add Station is unsucessful", __func__);
- wlan_hdd_tdls_set_link_status(pAdapter, mac, eTDLS_LINK_IDLE);
- return -EPERM;
- }
-
- return 0;
-}
-#endif
-
static int wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
struct net_device *dev, u8 *mac, struct station_parameters *params)
{
@@ -6383,7 +6517,7 @@
if (mask & BIT(NL80211_STA_FLAG_TDLS_PEER)) {
if (set & BIT(NL80211_STA_FLAG_TDLS_PEER)) {
- status = wlan_hdd_tdls_add_station(wiphy, dev, mac);
+ status = wlan_hdd_tdls_add_station(wiphy, dev, mac, 0, NULL);
}
}
#endif
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index ec04653..69610b2 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -3722,6 +3722,14 @@
tSirMacAddr peerMac;
tANI_U8 addIe[1]; //Variable lenght. Dont add any field after this.
} tSirTdlsSendMgmtReq, *tpSirSmeTdlsSendMgmtReq ;
+
+typedef enum TdlsAddOper
+{
+ TDLS_OPER_NONE,
+ TDLS_OPER_ADD,
+ TDLS_OPER_UPDATE
+} eTdlsAddOper;
+
/* TDLS Request struct SME-->PE */
typedef struct sSirTdlsAddStaReq
{
@@ -3730,8 +3738,18 @@
tANI_U8 sessionId; // Session ID
tANI_U16 transactionId; // Transaction ID for cmd
tSirMacAddr bssid; // For multi-session, for PE to locate peSession ID
+ eTdlsAddOper tdlsAddOper;
tSirMacAddr peerMac;
+ tANI_U16 capability;
+ tANI_U8 extn_capability[SIR_MAC_MAX_EXTN_CAP];
+ tANI_U8 supported_rates_length;
+ tANI_U8 supported_rates[SIR_MAC_MAX_SUPP_RATES];
+ tSirHTCap htCap;
+ tSirVHTCap vhtCap;
+ tANI_U8 uapsd_queues;
+ tANI_U8 max_sp;
} tSirTdlsAddStaReq, *tpSirSmeTdlsAddStaReq ;
+
/* TDLS Response struct PE-->SME */
typedef struct sSirTdlsAddStaRsp
{
@@ -3744,6 +3762,7 @@
tANI_U16 staType ;
tANI_U8 ucastSig;
tANI_U8 bcastSig;
+ eTdlsAddOper tdlsAddOper;
} tSirTdlsAddStaRsp ;
/* TDLS Request struct SME-->PE */
typedef struct sSirTdlsDelStaReq
diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h
index b2b562a..73e3d0a 100644
--- a/CORE/MAC/inc/sirMacProtDef.h
+++ b/CORE/MAC/inc/sirMacProtDef.h
@@ -1585,6 +1585,129 @@
tSirMacRpiReport rpiReport;
} tSirMacRpiReportIE, *tpSirMacRpiReportIE;
+#define SIR_MAC_MAX_SUPP_RATES 32
+
+#define SIR_MAC_MAX_EXTN_CAP 8
+
+// VHT Capabilities Info
+typedef __ani_attr_pre_packed struct sSirMacVHTCapabilityInfo
+{
+#ifndef ANI_LITTLE_BIT_ENDIAN
+ tANI_U32 reserved1: 2;
+ tANI_U32 txAntPattern: 1;
+ tANI_U32 rxAntPattern: 1;
+ tANI_U32 vhtLinkAdaptCap: 2;
+ tANI_U32 maxAMPDULenExp: 3;
+ tANI_U32 htcVHTCap: 1;
+ tANI_U32 vhtTXOPPS: 1;
+ tANI_U32 muBeamformeeCap: 1;
+ tANI_U32 muBeamformerCap: 1;
+ tANI_U32 numSoundingDim: 3;
+ tANI_U32 csnofBeamformerAntSup: 3;
+ tANI_U32 suBeamformeeCap: 1;
+ tANI_U32 suBeamFormerCap: 1;
+ tANI_U32 rxSTBC: 3;
+ tANI_U32 txSTBC: 1;
+ tANI_U32 shortGI160and80plus80MHz: 1;
+ tANI_U32 shortGI80MHz: 1;
+ tANI_U32 ldpcCodingCap: 1;
+ tANI_U32 supportedChannelWidthSet: 2;
+ tANI_U32 maxMPDULen: 2;
+#else
+ tANI_U32 maxMPDULen: 2;
+ tANI_U32 supportedChannelWidthSet: 2;
+ tANI_U32 ldpcCodingCap: 1;
+ tANI_U32 shortGI80MHz: 1;
+ tANI_U32 shortGI160and80plus80MHz: 1;
+ tANI_U32 txSTBC: 1;
+ tANI_U32 rxSTBC: 3;
+ tANI_U32 suBeamFormerCap: 1;
+ tANI_U32 suBeamformeeCap: 1;
+ tANI_U32 csnofBeamformerAntSup: 3;
+ tANI_U32 numSoundingDim: 3;
+ tANI_U32 muBeamformerCap: 1;
+ tANI_U32 muBeamformeeCap: 1;
+ tANI_U32 vhtTXOPPS: 1;
+ tANI_U32 htcVHTCap: 1;
+ tANI_U32 maxAMPDULenExp: 3;
+ tANI_U32 vhtLinkAdaptCap: 2;
+ tANI_U32 rxAntPattern: 1;
+ tANI_U32 txAntPattern: 1;
+ tANI_U32 reserved1: 2;
+#endif
+} __ani_attr_packed tSirMacVHTCapabilityInfo;
+
+typedef __ani_attr_pre_packed struct sSirMacVHTTxSupDataRateInfo
+{
+#ifndef ANI_LITTLE_BIT_ENDIAN
+ tANI_U16 reserved: 3;
+ tANI_U16 txSupDataRate: 13;
+#else
+ tANI_U16 txSupDataRate: 13;
+ tANI_U16 reserved: 3;
+#endif
+}__ani_attr_packed tSirMacVHTTxSupDataRateInfo;
+
+typedef __ani_attr_pre_packed struct sSirMacVHTRxSupDataRateInfo
+{
+#ifndef ANI_LITTLE_BIT_ENDIAN
+ tANI_U16 reserved: 3;
+ tANI_U16 rxSupDataRate: 13;
+#else
+ tANI_U16 rxSupDataRate: 13;
+ tANI_U16 reserved: 3;
+#endif
+}__ani_attr_packed tSirMacVHTRxSupDataRateInfo;
+
+/**
+ * struct sSirVhtMcsInfo - VHT MCS information
+ * @rx_mcs_map: RX MCS map 2 bits for each stream, total 8 streams
+ * @rx_highest: Indicates highest long GI VHT PPDU data rate
+ * STA can receive. Rate expressed in units of 1 Mbps.
+ * If this field is 0 this value should not be used to
+ * consider the highest RX data rate supported.
+ * @tx_mcs_map: TX MCS map 2 bits for each stream, total 8 streams
+ * @tx_highest: Indicates highest long GI VHT PPDU data rate
+ * STA can transmit. Rate expressed in units of 1 Mbps.
+ * If this field is 0 this value should not be used to
+ * consider the highest TX data rate supported.
+ */
+typedef struct sSirVhtMcsInfo {
+ tANI_U16 rxMcsMap;
+ tANI_U16 rxHighest;
+ tANI_U16 txMcsMap;
+ tANI_U16 txHighest;
+}tSirVhtMcsInfo;
+
+/**
+ * struct sSirVHtCap - VHT capabilities
+ *
+ * This structure is the "VHT capabilities element" as
+ * described in 802.11ac D3.0 8.4.2.160
+ * @vht_cap_info: VHT capability info
+ * @supp_mcs: VHT MCS supported rates
+ */
+typedef struct sSirVHtCap {
+ tANI_U32 vhtCapInfo;
+ tSirVhtMcsInfo suppMcs;
+}tSirVHTCap;
+
+/**
+ * struct sSirHtCap - HT capabilities
+ *
+ * This structure refers to "HT capabilities element" as
+ * described in 802.11n draft section 7.3.2.52
+ */
+
+
+typedef struct sSirHtCap {
+ tANI_U16 capInfo;
+ tANI_U8 ampduParamsInfo;
+ tANI_U8 suppMcsSet[16];
+ tANI_U16 extendedHtCapInfo;
+ tANI_U32 txBFCapInfo;
+ tANI_U8 antennaSelectionInfo;
+}tSirHTCap;
// HT Cap and HT IE Size defines
#define HT_CAPABILITY_IE_SIZE 28
diff --git a/CORE/MAC/src/include/dot11f.h b/CORE/MAC/src/include/dot11f.h
index 0fe2963..318d5e1 100644
--- a/CORE/MAC/src/include/dot11f.h
+++ b/CORE/MAC/src/include/dot11f.h
@@ -3032,6 +3032,31 @@
#ifdef __cplusplus
}; /* End extern "C". */
#endif /* C++ */
+// EID 197 (0xc5)
+typedef struct sDot11fIEAID {
+ tANI_U8 present;
+ tANI_U16 assocId;
+} tDot11fIEAID;
+
+#define DOT11F_EID_AID ( 197 )
+
+// N.B. These #defines do *not* include the EID & length
+#define DOT11F_IE_AID_MIN_LEN ( 2 )
+
+#define DOT11F_IE_AID_MAX_LEN ( 2 )
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* C++ */
+tANI_U32 dot11fUnpackIeAID(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEAID*);
+
+tANI_U32 dot11fPackIeAID(tpAniSirGlobal, tDot11fIEAID*, tANI_U8*, tANI_U32, tANI_U32*);
+
+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;
@@ -7244,6 +7269,7 @@
tDot11fIERICData RICData;
tDot11fIEHTCaps HTCaps;
tDot11fIELinkIdentifier LinkIdentifier;
+ tDot11fIEVHTCaps VHTCaps;
} tDot11fTDLSDisRsp;
#define DOT11F_TDLSDISRSP ( 45 )
@@ -7316,6 +7342,7 @@
tDot11fIEHTInfo HTInfo;
tDot11fIELinkIdentifier LinkIdentifier;
tDot11fIEWMMInfoStation WMMInfoStation;
+ tDot11fIEVHTOperation VHTOperation;
} tDot11fTDLSSetupCnf;
#define DOT11F_TDLSSETUPCNF ( 48 )
@@ -7350,6 +7377,8 @@
tDot11fIEHTCaps HTCaps;
tDot11fIELinkIdentifier LinkIdentifier;
tDot11fIEWMMInfoStation WMMInfoStation;
+ tDot11fIEAID AID;
+ tDot11fIEVHTCaps VHTCaps;
} tDot11fTDLSSetupReq;
#define DOT11F_TDLSSETUPREQ ( 49 )
@@ -7385,6 +7414,8 @@
tDot11fIEHTCaps HTCaps;
tDot11fIELinkIdentifier LinkIdentifier;
tDot11fIEWMMInfoStation WMMInfoStation;
+ tDot11fIEAID AID;
+ tDot11fIEVHTCaps VHTCaps;
} tDot11fTDLSSetupRsp;
#define DOT11F_TDLSSETUPRSP ( 50 )
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c
index 00dfb3c..5c12f6d 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.c
@@ -1522,8 +1522,11 @@
tpPESession psessionEntry)
{
tANI_U32 val;
+ tANI_U32 selfStaDot11Mode=0;
+ wlan_cfgGetInt(pMac,WNI_CFG_DOT11_MODE,&selfStaDot11Mode);
- if(IS_DOT11_MODE_VHT(psessionEntry->dot11mode))
+// if(IS_DOT11_MODE_VHT(psessionEntry->dot11mode))
+ if (IS_DOT11_MODE_VHT(selfStaDot11Mode))
{
if ( wlan_cfgGetInt( pMac,WNI_CFG_VHT_RX_MCS_MAP,&val) !=
eSIR_SUCCESS )
@@ -1627,8 +1630,10 @@
tANI_U32 i,j,val,min,isArate;
tANI_U32 phyMode = 0;
+ tANI_U32 selfStaDot11Mode=0;
isArate = 0;
+ wlan_cfgGetInt(pMac, WNI_CFG_DOT11_MODE, &selfStaDot11Mode);
limGetPhyMode(pMac, &phyMode, psessionEntry);
// Get own rate set
@@ -1740,7 +1745,8 @@
}
- if(IS_DOT11_MODE_HT(psessionEntry->dot11mode))
+ //if(IS_DOT11_MODE_HT(psessionEntry->dot11mode))
+ if (IS_DOT11_MODE_HT(selfStaDot11Mode))
{
val = SIZE_OF_SUPPORTED_MCS_SET;
if (wlan_cfgGetStr(pMac, WNI_CFG_SUPPORTED_MCS_SET,
@@ -2090,7 +2096,7 @@
tSirRetStatus
limAddSta(
tpAniSirGlobal pMac,
- tpDphHashNode pStaDs,tpPESession psessionEntry)
+ tpDphHashNode pStaDs, tANI_U8 updateEntry, tpPESession psessionEntry)
{
tpAddStaParams pAddStaParams = NULL;
tSirMsgQ msgQ;
@@ -2158,6 +2164,8 @@
pAddStaParams->staIdx = HAL_STA_INVALID_IDX;
pAddStaParams->staType = pStaDs->staType;
+ pAddStaParams->updateSta = updateEntry;
+
pAddStaParams->status = eHAL_STATUS_SUCCESS;
pAddStaParams->respReqd = 1;
//Update HT Capability
@@ -2517,6 +2525,19 @@
tSirRetStatus retCode = eSIR_SUCCESS;
tSirMacAddr staMac;
tANI_U32 listenInterval = WNI_CFG_LISTEN_INTERVAL_STADEF;
+ /*This self Sta dot 11 mode comes from the cfg and the expectation here is
+ * that cfg carries the systemwide capability that device under
+ * consideration can support. This capability gets plumbed into the cfg
+ * cache at system initialization time via the .dat and .ini file override
+ * mechanisms and will not change. If it does change, it is the
+ * responsibility of SME to evict the selfSta and reissue a new AddStaSelf
+ * command.*/
+ tANI_U32 selfStaDot11Mode=0, selfTxWidth=0;
+ wlan_cfgGetInt(pMac,WNI_CFG_DOT11_MODE,&selfStaDot11Mode);
+ limLog( pMac, LOG1, FL("cfgDot11Mode %d"),(int)selfStaDot11Mode);
+ wlan_cfgGetInt(pMac,WNI_CFG_HT_CAP_INFO_SUPPORTED_CHAN_WIDTH_SET,&selfTxWidth);
+ limLog( pMac, LOG1, FL("SGI 20 %d"),(int)selfTxWidth);
+ limLog( pMac, LOG1, FL("Roam Channel Bonding Mode %d"),(int)pMac->roam.configParam.uCfgDot11Mode);
#if 0
retCode =wlan_cfgGetStr(pMac, WNI_CFG_STA_ID, staMac, &cfg);
@@ -2563,9 +2584,12 @@
#else
limPopulateOwnRateSet(pMac, &pAddStaParams->supportedRates, NULL, false,psessionEntry);
#endif
- if( psessionEntry->htCapability)
+// if( psessionEntry->htCapability)---> old check
+ /*We used to check if the session is htCapable before setting the htCapable
+ * flag. The check limited us from operating */
+ if ( IS_DOT11_MODE_HT(selfStaDot11Mode) )
{
- pAddStaParams->htCapable = psessionEntry->htCapability;
+ pAddStaParams->htCapable = TRUE ;
#ifdef DISABLE_GF_FOR_INTEROP
/*
* To resolve the interop problem with Broadcom AP,
@@ -2580,23 +2604,32 @@
}
else
#endif
-
- pAddStaParams->greenFieldCapable = limGetHTCapability( pMac, eHT_GREENFIELD, psessionEntry);
- pAddStaParams->txChannelWidthSet = limGetHTCapability( pMac, eHT_SUPPORTED_CHANNEL_WIDTH_SET, psessionEntry);
- pAddStaParams->mimoPS = limGetHTCapability( pMac, eHT_MIMO_POWER_SAVE, psessionEntry );
- pAddStaParams->rifsMode = limGetHTCapability( pMac, eHT_RIFS_MODE, psessionEntry );
- pAddStaParams->lsigTxopProtection = limGetHTCapability( pMac, eHT_LSIG_TXOP_PROTECTION, psessionEntry );
- pAddStaParams->delBASupport = limGetHTCapability( pMac, eHT_DELAYED_BA, psessionEntry );
- pAddStaParams->maxAmpduDensity = limGetHTCapability( pMac, eHT_MPDU_DENSITY, psessionEntry );
- pAddStaParams->maxAmpduSize = limGetHTCapability(pMac, eHT_MAX_RX_AMPDU_FACTOR, psessionEntry);
- pAddStaParams->maxAmsduSize = limGetHTCapability( pMac, eHT_MAX_AMSDU_LENGTH, psessionEntry );
- pAddStaParams->fDsssCckMode40Mhz = limGetHTCapability( pMac, eHT_DSSS_CCK_MODE_40MHZ, psessionEntry);
- pAddStaParams->fShortGI20Mhz = limGetHTCapability( pMac, eHT_SHORT_GI_20MHZ, psessionEntry);
- pAddStaParams->fShortGI40Mhz = limGetHTCapability( pMac, eHT_SHORT_GI_40MHZ, psessionEntry);
+ {
+ pAddStaParams->greenFieldCapable = limGetHTCapability( pMac, eHT_GREENFIELD, psessionEntry);
+ pAddStaParams->txChannelWidthSet =
+ pMac->roam.configParam.channelBondingMode5GHz;
+ // pAddStaParams->txChannelWidthSet = limGetHTCapability( pMac, eHT_SUPPORTED_CHANNEL_WIDTH_SET, psessionEntry);
+ pAddStaParams->mimoPS = limGetHTCapability( pMac, eHT_MIMO_POWER_SAVE, psessionEntry );
+ pAddStaParams->rifsMode = limGetHTCapability( pMac, eHT_RIFS_MODE, psessionEntry );
+ pAddStaParams->lsigTxopProtection = limGetHTCapability( pMac, eHT_LSIG_TXOP_PROTECTION, psessionEntry );
+ pAddStaParams->delBASupport = limGetHTCapability( pMac, eHT_DELAYED_BA, psessionEntry );
+ pAddStaParams->maxAmpduDensity = limGetHTCapability( pMac, eHT_MPDU_DENSITY, psessionEntry );
+ pAddStaParams->maxAmpduSize = limGetHTCapability(pMac, eHT_MAX_RX_AMPDU_FACTOR, psessionEntry);
+ pAddStaParams->maxAmsduSize = limGetHTCapability( pMac, eHT_MAX_AMSDU_LENGTH, psessionEntry );
+ pAddStaParams->fDsssCckMode40Mhz = limGetHTCapability( pMac, eHT_DSSS_CCK_MODE_40MHZ, psessionEntry);
+ pAddStaParams->fShortGI20Mhz = WNI_CFG_SHORT_GI_20MHZ_STAMAX;
+ // pAddStaParams->fShortGI20Mhz = limGetHTCapability( pMac, eHT_SHORT_GI_20MHZ, psessionEntry);
+ pAddStaParams->fShortGI40Mhz = WNI_CFG_SHORT_GI_40MHZ_STAMAX;
+ // pAddStaParams->fShortGI40Mhz = limGetHTCapability( pMac, eHT_SHORT_GI_40MHZ, psessionEntry);
+ }
}
#ifdef WLAN_FEATURE_11AC
- pAddStaParams->vhtCapable = psessionEntry->vhtCapability;
- pAddStaParams->vhtTxChannelWidthSet = psessionEntry->apChanWidth;
+ pAddStaParams->vhtCapable = IS_DOT11_MODE_VHT(selfStaDot11Mode);
+ if (pAddStaParams->vhtCapable){
+ pAddStaParams->vhtTxChannelWidthSet =
+ pMac->roam.configParam.nVhtChannelWidth;
+ limLog( pMac, LOG1, FL("VHT WIDTH SET %d"),pAddStaParams->vhtTxChannelWidthSet);
+ }
pAddStaParams->vhtTxBFCapable = psessionEntry->txBFIniFeatureEnabled;
#endif
@@ -2615,7 +2648,8 @@
pAddStaParams->p2pCapableSta = 1;
}
- limFillSupportedRatesInfo(pMac, NULL, &pAddStaParams->supportedRates,psessionEntry);
+ //limFillSupportedRatesInfo(pMac, NULL, &pAddStaParams->supportedRates,psessionEntry);
+ pAddStaParams->supportedRates.opRateMode = limGetStaRateMode((tANI_U8)selfStaDot11Mode);
msgQ.type = WDA_ADD_STA_REQ;
//
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.h b/CORE/MAC/src/pe/lim/limAssocUtils.h
index 3e21a26..9a7ba3b 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.h
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.h
@@ -113,7 +113,7 @@
#endif
-tSirRetStatus limAddSta(tpAniSirGlobal, tpDphHashNode,tpPESession);
+tSirRetStatus limAddSta(tpAniSirGlobal, tpDphHashNode, tANI_U8, tpPESession);
tSirRetStatus limDelBss(tpAniSirGlobal, tpDphHashNode, tANI_U16, tpPESession);
tSirRetStatus limDelSta(tpAniSirGlobal, tpDphHashNode, tANI_BOOLEAN, tpPESession);
#ifdef WLAN_FEATURE_VOWIFI_11R
diff --git a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
index cce194d..886536c 100644
--- a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
+++ b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
@@ -1095,7 +1095,7 @@
ibss_sta_info_update(pMac, pStaDs, pPeerNode,psessionEntry);
PELOGW(limLog(pMac, LOGW, FL("initiating ADD STA for the IBSS peer.\n"));)
- retCode = limAddSta(pMac, pStaDs,psessionEntry);
+ retCode = limAddSta(pMac, pStaDs, false, psessionEntry);
if(retCode != eSIR_SUCCESS)
{
PELOGE(limLog(pMac, LOGE, FL("ibss-sta-add failed (reason %x)\n"), retCode);)
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
index c75efcb..c8fcf31 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
@@ -1220,7 +1220,7 @@
pStaDs->mlmStaContext.updateContext = 0;
// BTAMP: Add STA context at HW - issue WDA_ADD_STA_REQ to HAL
- if (limAddSta(pMac, pStaDs,psessionEntry) != eSIR_SUCCESS)
+ if (limAddSta(pMac, pStaDs, false, psessionEntry) != eSIR_SUCCESS)
{
limLog(pMac, LOGE, FL("could not Add STA with assocId=%d\n"), pStaDs->assocId);
limRejectAssociation( pMac, pStaDs->staAddr, pStaDs->mlmStaContext.subType,
@@ -1258,7 +1258,7 @@
{
/* mlmState is changed in limAddSta context */
/* use the same AID, already allocated */
- if (limAddSta(pMac, pStaDs,psessionEntry) != eSIR_SUCCESS)
+ if (limAddSta(pMac, pStaDs, false, psessionEntry) != eSIR_SUCCESS)
{
limLog( pMac, LOGE, FL( "AP do not support UPASD REASSOC Failed\n" ));
limRejectAssociation( pMac, pStaDs->staAddr, pStaDs->mlmStaContext.subType, true, pStaDs->mlmStaContext.authType,
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index 883ea3e..fe34432 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -2168,7 +2168,7 @@
if(eLIM_MLM_WT_ASSOC_DEL_STA_RSP_STATE == pStaDs->mlmStaContext.mlmState)
{
palFreeMemory( pMac->hHdd, (void *) pDelStaParams );
- if (limAddSta(pMac, pStaDs,psessionEntry) != eSIR_SUCCESS)
+ if (limAddSta(pMac, pStaDs, false, psessionEntry) != eSIR_SUCCESS)
{
PELOGE(limLog(pMac, LOGE,
FL("could not Add STA with assocId=%d\n"),
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index 920ea4b..901e64c 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -136,13 +136,22 @@
tpPESession psessionEntry) ;
#endif
-static tSirRetStatus limTdlsSetupAddSta(tpAniSirGlobal pMac, tSirMacAddr,
- tLimTdlsLinkSetupPeer *setupPeer, tpPESession psessionEntry) ;
+static tSirRetStatus limTdlsSetupAddSta(tpAniSirGlobal pMac,
+ tSirTdlsAddStaReq *pAddStaReq,
+ tpPESession psessionEntry) ;
void PopulateDot11fLinkIden(tpAniSirGlobal pMac, tpPESession psessionEntry,
tDot11fIELinkIdentifier *linkIden,
tSirMacAddr peerMac , tANI_U8 reqType) ;
void PopulateDot11fTdlsExtCapability(tpAniSirGlobal pMac,
tDot11fIEExtCap *extCapability) ;
+
+void limLogVHTCap(tpAniSirGlobal pMac,
+ tDot11fIEVHTCaps *pDot11f);
+tSirRetStatus limPopulateVhtMcsSet(tpAniSirGlobal pMac,
+ tpSirSupportedRates pRates,
+ tDot11fIEVHTCaps *pPeerVHTCaps,
+ tpPESession psessionEntry);
+ePhyChanBondState limGetHTCBState(ePhyChanBondState aniCBMode);
/*
* TDLS data frames will go out/come in as non-qos data.
* so, eth_890d_header will be aligned access..
@@ -1194,8 +1203,19 @@
*/
/* Include HT Capability IE */
- PopulateDot11fHTCaps( pMac, psessionEntry, &tdlsSetupReq.HTCaps );
-
+ PopulateDot11fHTCaps( pMac, NULL, &tdlsSetupReq.HTCaps );
+ if (tdlsSetupReq.HTCaps.present)
+ {
+ tdlsSetupReq.HTCaps.supportedChannelWidthSet = 1; // pVhtCaps->supportedChannelWidthSet;
+ }
+ /* Include VHT Capability IE */
+ PopulateDot11fVHTCaps( pMac, &tdlsSetupReq.VHTCaps );
+ if (tdlsSetupReq.VHTCaps.present)
+ {
+ tdlsSetupReq.VHTCaps.supportedChannelWidthSet = 1; // pVhtCaps->supportedChannelWidthSet;
+ tdlsSetupReq.VHTCaps.ldpcCodingCap = 1; // pVhtCaps->ldpcCodingCap
+ tdlsSetupReq.VHTCaps.suBeamFormerCap = 1; // pVhtCaps->suBeamFormerCap
+ }
/*
* now we pack it. First, how much space are we going to need?
*/
@@ -1587,12 +1607,20 @@
tdlsSetupRsp.QOSCapsStation.acvi_uapsd = 1;
tdlsSetupRsp.QOSCapsStation.acvo_uapsd = 1;
- /* Include HT Info IE */
-// if ( setupReq->HTCaps.present)
-// {
- PopulateDot11fHTCaps( pMac, psessionEntry, &tdlsSetupRsp.HTCaps );
-// }
+ PopulateDot11fHTCaps( pMac, NULL, &tdlsSetupRsp.HTCaps );
+ if (tdlsSetupRsp.HTCaps.present)
+ {
+ tdlsSetupRsp.HTCaps.supportedChannelWidthSet = 1; // pVhtCaps->supportedChannelWidthSet;
+ }
+ /* Include VHT Capability IE */
+ PopulateDot11fVHTCaps( pMac, &tdlsSetupRsp.VHTCaps );
+ if (tdlsSetupRsp.VHTCaps.present)
+ {
+ tdlsSetupRsp.VHTCaps.supportedChannelWidthSet = 1; // pVhtCaps->supportedChannelWidthSet;
+ tdlsSetupRsp.VHTCaps.ldpcCodingCap = 1; // pVhtCaps->ldpcCodingCap
+ tdlsSetupRsp.VHTCaps.suBeamFormerCap = 1; // pVhtCaps->suBeamFormerCap
+ }
tdlsSetupRsp.Status.status = setupStatus ;
/*
@@ -1767,10 +1795,15 @@
*/
/* Include HT Info IE */
- //if ( tdlsSetupCnf.HTCaps.present)
- //{
- // PopulateDot11fHTInfo( pMac, &tdlsSetupCnf.HTInfo, psessionEntry );
- // }
+ /* Need to also check the Self Capability ??? TODO Sunil */
+ if ( true == psessionEntry->htCapability)
+ {
+ PopulateDot11fHTInfo( pMac, &tdlsSetupCnf.HTInfo, psessionEntry );
+ }
+ if ( true == psessionEntry->vhtCapability)
+ {
+ PopulateDot11fVHTOperation( pMac, &tdlsSetupCnf.VHTOperation);
+ }
/*
* now we pack it. First, how much space are we going to need?
@@ -2114,22 +2147,442 @@
return ;
}
#endif
+
+/* This Function is similar to PopulateDot11fHTCaps , except that the HT Capabilities
+ * are considered from the AddStaReq rather from the cfg.dat as in PopulateDot11fHTCaps
+ */
+static tSirRetStatus limTdlsPopulateDot11fHTCaps(tpAniSirGlobal pMac, tpPESession psessionEntry,
+ tSirTdlsAddStaReq *pTdlsAddStaReq, tDot11fIEHTCaps *pDot11f)
+{
+ tANI_U32 nCfgValue;
+ tANI_U8 nCfgValue8;
+ tSirMacHTParametersInfo *pHTParametersInfo;
+ union {
+ tANI_U16 nCfgValue16;
+ tSirMacHTCapabilityInfo htCapInfo;
+ tSirMacExtendedHTCapabilityInfo extHtCapInfo;
+ } uHTCapabilityInfo;
+
+ tSirMacTxBFCapabilityInfo *pTxBFCapabilityInfo;
+ tSirMacASCapabilityInfo *pASCapabilityInfo;
+
+ nCfgValue = pTdlsAddStaReq->htCap.capInfo;
+
+ uHTCapabilityInfo.nCfgValue16 = nCfgValue & 0xFFFF;
+
+ pDot11f->advCodingCap = uHTCapabilityInfo.htCapInfo.advCodingCap;
+ pDot11f->mimoPowerSave = uHTCapabilityInfo.htCapInfo.mimoPowerSave;
+ pDot11f->greenField = uHTCapabilityInfo.htCapInfo.greenField;
+ pDot11f->shortGI20MHz = uHTCapabilityInfo.htCapInfo.shortGI20MHz;
+ pDot11f->shortGI40MHz = uHTCapabilityInfo.htCapInfo.shortGI40MHz;
+ pDot11f->txSTBC = uHTCapabilityInfo.htCapInfo.txSTBC;
+ pDot11f->rxSTBC = uHTCapabilityInfo.htCapInfo.rxSTBC;
+ pDot11f->delayedBA = uHTCapabilityInfo.htCapInfo.delayedBA;
+ pDot11f->maximalAMSDUsize = uHTCapabilityInfo.htCapInfo.maximalAMSDUsize;
+ pDot11f->dsssCckMode40MHz = uHTCapabilityInfo.htCapInfo.dsssCckMode40MHz;
+ pDot11f->psmp = uHTCapabilityInfo.htCapInfo.psmp;
+ pDot11f->stbcControlFrame = uHTCapabilityInfo.htCapInfo.stbcControlFrame;
+ pDot11f->lsigTXOPProtection = uHTCapabilityInfo.htCapInfo.lsigTXOPProtection;
+
+ // All sessionized entries will need the check below
+ if (psessionEntry == NULL) // Only in case of NO session
+ {
+ pDot11f->supportedChannelWidthSet = uHTCapabilityInfo.htCapInfo.supportedChannelWidthSet;
+ }
+ else
+ {
+ pDot11f->supportedChannelWidthSet = psessionEntry->htSupportedChannelWidthSet;
+ }
+
+ /* Ensure that shortGI40MHz is Disabled if supportedChannelWidthSet is
+ eHT_CHANNEL_WIDTH_20MHZ */
+ if(pDot11f->supportedChannelWidthSet == eHT_CHANNEL_WIDTH_20MHZ)
+ {
+ pDot11f->shortGI40MHz = 0;
+ }
+
+ dot11fLog(pMac, LOG2, FL("SupportedChnlWidth: %d, mimoPS: %d, GF: %d, shortGI20:%d, shortGI40: %d, dsssCck: %d"),
+ pDot11f->supportedChannelWidthSet, pDot11f->mimoPowerSave, pDot11f->greenField,
+ pDot11f->shortGI20MHz, pDot11f->shortGI40MHz, pDot11f->dsssCckMode40MHz);
+
+ nCfgValue = pTdlsAddStaReq->htCap.ampduParamsInfo;
+
+ nCfgValue8 = ( tANI_U8 ) nCfgValue;
+ pHTParametersInfo = ( tSirMacHTParametersInfo* ) &nCfgValue8;
+
+ pDot11f->maxRxAMPDUFactor = pHTParametersInfo->maxRxAMPDUFactor;
+ pDot11f->mpduDensity = pHTParametersInfo->mpduDensity;
+ pDot11f->reserved1 = pHTParametersInfo->reserved;
+
+ dot11fLog( pMac, LOG2, FL( "AMPDU Param: %x" ), nCfgValue);
+
+ palCopyMemory(pMac->hHdd, pDot11f->supportedMCSSet, pTdlsAddStaReq->htCap.suppMcsSet, SIZE_OF_SUPPORTED_MCS_SET);
+
+ nCfgValue = pTdlsAddStaReq->htCap.extendedHtCapInfo;
+
+ uHTCapabilityInfo.nCfgValue16 = nCfgValue & 0xFFFF;
+
+ pDot11f->pco = uHTCapabilityInfo.extHtCapInfo.pco;
+ pDot11f->transitionTime = uHTCapabilityInfo.extHtCapInfo.transitionTime;
+ pDot11f->mcsFeedback = uHTCapabilityInfo.extHtCapInfo.mcsFeedback;
+
+ nCfgValue = pTdlsAddStaReq->htCap.txBFCapInfo;
+
+ pTxBFCapabilityInfo = ( tSirMacTxBFCapabilityInfo* ) &nCfgValue;
+ pDot11f->txBF = pTxBFCapabilityInfo->txBF;
+ pDot11f->rxStaggeredSounding = pTxBFCapabilityInfo->rxStaggeredSounding;
+ pDot11f->txStaggeredSounding = pTxBFCapabilityInfo->txStaggeredSounding;
+ pDot11f->rxZLF = pTxBFCapabilityInfo->rxZLF;
+ pDot11f->txZLF = pTxBFCapabilityInfo->txZLF;
+ pDot11f->implicitTxBF = pTxBFCapabilityInfo->implicitTxBF;
+ pDot11f->calibration = pTxBFCapabilityInfo->calibration;
+ pDot11f->explicitCSITxBF = pTxBFCapabilityInfo->explicitCSITxBF;
+ pDot11f->explicitUncompressedSteeringMatrix = pTxBFCapabilityInfo->explicitUncompressedSteeringMatrix;
+ pDot11f->explicitBFCSIFeedback = pTxBFCapabilityInfo->explicitBFCSIFeedback;
+ pDot11f->explicitUncompressedSteeringMatrixFeedback = pTxBFCapabilityInfo->explicitUncompressedSteeringMatrixFeedback;
+ pDot11f->explicitCompressedSteeringMatrixFeedback = pTxBFCapabilityInfo->explicitCompressedSteeringMatrixFeedback;
+ pDot11f->csiNumBFAntennae = pTxBFCapabilityInfo->csiNumBFAntennae;
+ pDot11f->uncompressedSteeringMatrixBFAntennae = pTxBFCapabilityInfo->uncompressedSteeringMatrixBFAntennae;
+ pDot11f->compressedSteeringMatrixBFAntennae = pTxBFCapabilityInfo->compressedSteeringMatrixBFAntennae;
+
+ nCfgValue = pTdlsAddStaReq->htCap.antennaSelectionInfo;
+
+ nCfgValue8 = ( tANI_U8 ) nCfgValue;
+
+ pASCapabilityInfo = ( tSirMacASCapabilityInfo* ) &nCfgValue8;
+ pDot11f->antennaSelection = pASCapabilityInfo->antennaSelection;
+ pDot11f->explicitCSIFeedbackTx = pASCapabilityInfo->explicitCSIFeedbackTx;
+ pDot11f->antennaIndicesFeedbackTx = pASCapabilityInfo->antennaIndicesFeedbackTx;
+ pDot11f->explicitCSIFeedback = pASCapabilityInfo->explicitCSIFeedback;
+ pDot11f->antennaIndicesFeedback = pASCapabilityInfo->antennaIndicesFeedback;
+ pDot11f->rxAS = pASCapabilityInfo->rxAS;
+ pDot11f->txSoundingPPDUs = pASCapabilityInfo->txSoundingPPDUs;
+
+ pDot11f->present = 1;
+
+ return eSIR_SUCCESS;
+
+}
+
+tSirRetStatus
+limTdlsPopulateDot11fVHTCaps(tpAniSirGlobal pMac,
+ tSirTdlsAddStaReq *pTdlsAddStaReq,
+ tDot11fIEVHTCaps *pDot11f)
+{
+ tANI_U32 nCfgValue=0;
+ union {
+ tANI_U32 nCfgValue32;
+ tSirMacVHTCapabilityInfo vhtCapInfo;
+ } uVHTCapabilityInfo;
+ union {
+ tANI_U16 nCfgValue16;
+ tSirMacVHTTxSupDataRateInfo vhtTxSupDataRateInfo;
+ tSirMacVHTRxSupDataRateInfo vhtRxsupDataRateInfo;
+ } uVHTSupDataRateInfo;
+
+ pDot11f->present = 1;
+
+ nCfgValue = pTdlsAddStaReq->vhtCap.vhtCapInfo;
+ uVHTCapabilityInfo.nCfgValue32 = nCfgValue;
+
+ pDot11f->maxMPDULen = uVHTCapabilityInfo.vhtCapInfo.maxMPDULen;
+ pDot11f->supportedChannelWidthSet = uVHTCapabilityInfo.vhtCapInfo.supportedChannelWidthSet;
+ pDot11f->ldpcCodingCap = uVHTCapabilityInfo.vhtCapInfo.ldpcCodingCap;
+ pDot11f->shortGI80MHz = uVHTCapabilityInfo.vhtCapInfo.shortGI80MHz;
+ pDot11f->shortGI160and80plus80MHz = uVHTCapabilityInfo.vhtCapInfo.shortGI160and80plus80MHz;
+ pDot11f->txSTBC = uVHTCapabilityInfo.vhtCapInfo.txSTBC;
+ pDot11f->rxSTBC = uVHTCapabilityInfo.vhtCapInfo.rxSTBC;
+ pDot11f->suBeamFormerCap = uVHTCapabilityInfo.vhtCapInfo.suBeamFormerCap;
+ pDot11f->suBeamformeeCap = uVHTCapabilityInfo.vhtCapInfo.suBeamformeeCap;
+ pDot11f->csnofBeamformerAntSup = uVHTCapabilityInfo.vhtCapInfo.csnofBeamformerAntSup;
+ pDot11f->numSoundingDim = uVHTCapabilityInfo.vhtCapInfo.numSoundingDim;
+ pDot11f->muBeamformerCap = uVHTCapabilityInfo.vhtCapInfo.muBeamformerCap;
+ pDot11f->muBeamformeeCap = uVHTCapabilityInfo.vhtCapInfo.muBeamformeeCap;
+ pDot11f->vhtTXOPPS = uVHTCapabilityInfo.vhtCapInfo.vhtTXOPPS;
+ pDot11f->htcVHTCap = uVHTCapabilityInfo.vhtCapInfo.htcVHTCap;
+ pDot11f->maxAMPDULenExp = uVHTCapabilityInfo.vhtCapInfo.maxAMPDULenExp;
+ pDot11f->vhtLinkAdaptCap = uVHTCapabilityInfo.vhtCapInfo.vhtLinkAdaptCap;
+ pDot11f->rxAntPattern = uVHTCapabilityInfo.vhtCapInfo.rxAntPattern;
+ pDot11f->txAntPattern = uVHTCapabilityInfo.vhtCapInfo.txAntPattern;
+ pDot11f->reserved1= uVHTCapabilityInfo.vhtCapInfo.reserved1;
+
+ pDot11f->rxMCSMap = pTdlsAddStaReq->vhtCap.suppMcs.rxMcsMap;
+
+ nCfgValue = pTdlsAddStaReq->vhtCap.suppMcs.rxHighest;
+ uVHTSupDataRateInfo.nCfgValue16 = nCfgValue & 0xffff;
+ pDot11f->rxHighSupDataRate = uVHTSupDataRateInfo.vhtRxsupDataRateInfo.rxSupDataRate;
+
+ pDot11f->txMCSMap = pTdlsAddStaReq->vhtCap.suppMcs.txMcsMap;
+
+ nCfgValue = pTdlsAddStaReq->vhtCap.suppMcs.txHighest;
+ uVHTSupDataRateInfo.nCfgValue16 = nCfgValue & 0xffff;
+ pDot11f->txSupDataRate = uVHTSupDataRateInfo.vhtTxSupDataRateInfo.txSupDataRate;
+
+ pDot11f->reserved3= uVHTSupDataRateInfo.vhtTxSupDataRateInfo.reserved;
+
+ limLogVHTCap(pMac, pDot11f);
+
+ return eSIR_SUCCESS;
+
+}
+
+static tSirRetStatus
+limTdlsPopulateMatchingRateSet(tpAniSirGlobal pMac,
+ tpDphHashNode pStaDs,
+ tANI_U8 *pSupportedRateSet,
+ tANI_U8 supporteRatesLength,
+ tANI_U8* pSupportedMCSSet,
+ tSirMacPropRateSet *pAniLegRateSet,
+ tpPESession psessionEntry,
+ tDot11fIEVHTCaps *pVHTCaps)
+
+{
+ tSirMacRateSet tempRateSet;
+ tANI_U32 i,j,val,min,isArate;
+ tSirMacRateSet tempRateSet2;
+ tANI_U32 phyMode;
+ tANI_U8 mcsSet[SIZE_OF_SUPPORTED_MCS_SET];
+ isArate=0;
+
+ // limGetPhyMode(pMac, &phyMode);
+ limGetPhyMode(pMac, &phyMode, NULL);
+
+ // get own rate set
+ val = WNI_CFG_OPERATIONAL_RATE_SET_LEN;
+ if (wlan_cfgGetStr(pMac, WNI_CFG_OPERATIONAL_RATE_SET,
+ (tANI_U8 *) &tempRateSet.rate,
+ &val) != eSIR_SUCCESS)
+ {
+ /// Could not get rateset from CFG. Log error.
+ limLog(pMac, LOGP, FL("could not retrieve rateset\n"));
+ }
+ tempRateSet.numRates = val;
+
+ if (phyMode == WNI_CFG_PHY_MODE_11G)
+ {
+
+ // get own extended rate set
+ val = WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET_LEN;
+ if (wlan_cfgGetStr(pMac, WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET,
+ (tANI_U8 *) &tempRateSet2.rate,
+ &val) != eSIR_SUCCESS)
+ tempRateSet2.numRates = val;
+ }
+ else
+ tempRateSet2.numRates = 0;
+
+ if ((tempRateSet.numRates + tempRateSet2.numRates) > 12)
+ {
+ PELOGE(limLog(pMac, LOGE, FL("more than 12 rates in CFG\n"));)
+ goto error;
+ }
+
+ /**
+ * Handling of the rate set IEs is the following:
+ * - keep only rates that we support and that the station supports
+ * - sort and the rates into the pSta->rate array
+ */
+
+ // Copy all rates in tempRateSet, there are 12 rates max
+ for (i = 0; i < tempRateSet2.numRates; i++)
+ tempRateSet.rate[i + tempRateSet.numRates] = tempRateSet2.rate[i];
+
+ tempRateSet.numRates += tempRateSet2.numRates;
+
+ /**
+ * Sort rates in tempRateSet (they are likely to be already sorted)
+ * put the result in tempRateSet2
+ */
+ tempRateSet2.numRates = 0;
+
+ for (i = 0;i < tempRateSet.numRates; i++)
+ {
+ min = 0;
+ val = 0xff;
+
+ for(j = 0;j < tempRateSet.numRates; j++)
+ if ((tANI_U32) (tempRateSet.rate[j] & 0x7f) < val)
+ {
+ val = tempRateSet.rate[j] & 0x7f;
+ min = j;
+ }
+
+ tempRateSet2.rate[tempRateSet2.numRates++] = tempRateSet.rate[min];
+ tempRateSet.rate[min] = 0xff;
+ }
+
+ /**
+ * Copy received rates in tempRateSet, the parser has ensured
+ * unicity of the rates so there cannot be more than 12 . Need to Check this
+ * TODO Sunil.
+ */
+ for (i = 0; i < supporteRatesLength; i++)
+ {
+ tempRateSet.rate[i] = pSupportedRateSet[i];
+ }
+
+ tempRateSet.numRates = supporteRatesLength;
+
+ {
+ tpSirSupportedRates rates = &pStaDs->supportedRates;
+ tANI_U8 aRateIndex = 0;
+ tANI_U8 bRateIndex = 0;
+ palZeroMemory( pMac->hHdd, (tANI_U8 *) rates, sizeof(tSirSupportedRates));
+
+ for (i = 0;i < tempRateSet2.numRates; i++)
+ {
+ for (j = 0;j < tempRateSet.numRates; j++)
+ {
+ if ((tempRateSet2.rate[i] & 0x7F) ==
+ (tempRateSet.rate[j] & 0x7F))
+ {
+#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
+ if ((bRateIndex > HAL_NUM_11B_RATES) || (aRateIndex > HAL_NUM_11A_RATES))
+ {
+ limLog(pMac, LOGE, FL("Invalid number of rates (11b->%d, 11a->%d)\n"),
+ bRateIndex, aRateIndex);
+ return eSIR_FAILURE;
+ }
+#endif
+ if (sirIsArate(tempRateSet2.rate[i] & 0x7f))
+ {
+ isArate=1;
+ rates->llaRates[aRateIndex++] = tempRateSet2.rate[i];
+ }
+ else
+ rates->llbRates[bRateIndex++] = tempRateSet2.rate[i];
+ break;
+ }
+ }
+ }
+ }
+
+
+ //compute the matching MCS rate set, if peer is 11n capable and self mode is 11n
+#ifdef FEATURE_WLAN_TDLS
+ if (pStaDs->mlmStaContext.htCapability)
+#else
+ if (IS_DOT11_MODE_HT(psessionEntry->dot11mode) &&
+ (pStaDs->mlmStaContext.htCapability))
+#endif
+ {
+ val = SIZE_OF_SUPPORTED_MCS_SET;
+ if (wlan_cfgGetStr(pMac, WNI_CFG_SUPPORTED_MCS_SET,
+ mcsSet,
+ &val) != eSIR_SUCCESS)
+ {
+ /// Could not get rateset from CFG. Log error.
+ limLog(pMac, LOGP, FL("could not retrieve supportedMCSSet\n"));
+ goto error;
+ }
+
+ for (i=0; i<val; i++)
+ pStaDs->supportedRates.supportedMCSSet[i] = mcsSet[i] & pSupportedMCSSet[i];
+
+ PELOG2(limLog(pMac, LOG2, FL("limPopulateMatchingRateSet: MCS Rate Set Bitmap from CFG and DPH :"));)
+ for (i=0; i<SIR_MAC_MAX_SUPPORTED_MCS_SET; i++)
+ {
+ PELOG2(limLog(pMac, LOG2,FL("%x %x "), mcsSet[i], pStaDs->supportedRates.supportedMCSSet[i]);)
+ }
+ }
+
+#ifdef WLAN_FEATURE_11AC
+ limPopulateVhtMcsSet(pMac, &pStaDs->supportedRates, pVHTCaps, psessionEntry);
+#endif
+ /**
+ * Set the erpEnabled bit iff the phy is in G mode and at least
+ * one A rate is supported
+ */
+ if ((phyMode == WNI_CFG_PHY_MODE_11G) && isArate)
+ pStaDs->erpEnabled = eHAL_SET;
+
+
+
+ return eSIR_SUCCESS;
+
+ error:
+
+ return eSIR_FAILURE;
+}
+
+static int limTdlsSelectCBMode(tDphHashNode *pStaDs, tpPESession psessionEntry)
+{
+ tANI_U8 channel = psessionEntry->currentOperChannel;
+
+ if ( pStaDs->mlmStaContext.vhtCapability )
+ {
+ if ( channel== 36 || channel == 52 || channel == 100 ||
+ channel == 116 || channel == 149 )
+ {
+ return PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW - 1;
+ }
+ else if ( channel == 40 || channel == 56 || channel == 104 ||
+ channel == 120 || channel == 153 )
+ {
+ return PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW - 1;
+ }
+ else if ( channel == 44 || channel == 60 || channel == 108 ||
+ channel == 124 || channel == 157 )
+ {
+ return PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH -1;
+ }
+ else if ( channel == 48 || channel == 64 || channel == 112 ||
+ channel == 128 || channel == 161 )
+ {
+ return PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH - 1;
+ }
+ else if ( channel == 165 )
+ {
+ return 0;
+ }
+ }
+ else if ( pStaDs->mlmStaContext.htCapability )
+ {
+ if ( channel== 40 || channel == 48 || channel == 56 ||
+ channel == 64 || channel == 104 || channel == 112 ||
+ channel == 120 || channel == 128 || channel == 136 ||
+ channel == 144 || channel == 153 || channel == 161 )
+ {
+ return 1;
+ }
+ else if ( channel== 36 || channel == 44 || channel == 52 ||
+ channel == 60 || channel == 100 || channel == 108 ||
+ channel == 116 || channel == 124 || channel == 132 ||
+ channel == 140 || channel == 149 || channel == 157 )
+ {
+ return 2;
+ }
+ else if ( channel == 165 )
+ {
+ return 0;
+ }
+ }
+ return 0;
+}
+
/*
* update HASH node entry info
*/
static void limTdlsUpdateHashNodeInfo(tpAniSirGlobal pMac, tDphHashNode *pStaDs,
- tLimTdlsLinkSetupPeer *setupPeerInfo, tpPESession psessionEntry)
+ tSirTdlsAddStaReq *pTdlsAddStaReq, tpPESession psessionEntry)
{
//tDot11fIEHTCaps *htCaps = &setupPeerInfo->tdlsPeerHTCaps ;
tDot11fIEHTCaps htCap, *htCaps;
#ifdef WLAN_FEATURE_11AC
tDot11fIEVHTCaps vhtCap, *pVhtCaps;
+ tANI_U8 cbMode;
#endif
tpDphHashNode pSessStaDs = NULL;
tANI_U16 aid;
- //HACK- to get the session's htcaps.
- PopulateDot11fHTCaps(pMac, psessionEntry, &htCap);
+ if (pTdlsAddStaReq->tdlsAddOper == TDLS_OPER_ADD)
+ {
+ PopulateDot11fHTCaps(pMac, psessionEntry, &htCap);
+ }
+ else if (pTdlsAddStaReq->tdlsAddOper == TDLS_OPER_UPDATE)
+ {
+ limTdlsPopulateDot11fHTCaps(pMac, NULL, pTdlsAddStaReq, &htCap);
+ }
htCaps = &htCap;
if (htCaps->present)
{
@@ -2147,7 +2600,6 @@
&pStaDs->supportedRates.rxHighestDataRate,
htCaps->supportedMCSSet);
pStaDs->baPolicyFlag = 0xFF;
-
pMac->lim.gLimTdlsLinkMode = TDLS_LINK_MODE_N ;
}
else
@@ -2156,16 +2608,15 @@
pMac->lim.gLimTdlsLinkMode = TDLS_LINK_MODE_BG ;
}
#ifdef WLAN_FEATURE_11AC
- //HACK- this needs to get from peer
- PopulateDot11fVHTCaps(pMac, &vhtCap);
+ limTdlsPopulateDot11fVHTCaps(pMac, pTdlsAddStaReq, &vhtCap);
pVhtCaps = &vhtCap;
if (pVhtCaps->present)
{
pStaDs->mlmStaContext.vhtCapability = 1 ;
- pStaDs->vhtSupportedChannelWidthSet= 1; // pVhtCaps->supportedChannelWidthSet;
- pStaDs->vhtLdpcCapable = 1; // pVhtCaps->ldpcCodingCap
- pStaDs->vhtBeamFormerCapable= 1; // pVhtCaps->suBeamFormerCap
-
+ pStaDs->vhtSupportedChannelWidthSet= pVhtCaps->supportedChannelWidthSet;
+ pStaDs->vhtLdpcCapable = pVhtCaps->ldpcCodingCap;
+ pStaDs->vhtBeamFormerCapable= pVhtCaps->suBeamFormerCap;
+ // TODO , is it necessary , Sunil???
pMac->lim.gLimTdlsLinkMode = TDLS_LINK_MODE_AC;
}
else
@@ -2173,6 +2624,17 @@
pStaDs->mlmStaContext.vhtCapability = 0 ;
}
#endif
+ /*Calculate the Secondary Coannel Offset */
+ cbMode = limTdlsSelectCBMode(pStaDs, psessionEntry);
+
+ pStaDs->htSecondaryChannelOffset = cbMode;
+
+#ifdef WLAN_FEATURE_11AC
+ if ( pStaDs->mlmStaContext.vhtCapability )
+ {
+ pStaDs->htSecondaryChannelOffset = limGetHTCBState(cbMode);
+ }
+#endif
pSessStaDs = dphLookupHashEntry(pMac, psessionEntry->bssId, &aid,
&psessionEntry->dph.dphHashTable) ;
@@ -2181,26 +2643,23 @@
pStaDs->qosMode = 1;
pStaDs->wmeEnabled = 1;
pStaDs->lleEnabled = 0;
- pStaDs->qos.capability.qosInfo = pSessStaDs->qos.capability.qosInfo; //setupPeerInfo->qosCaps.qosInfo;
+ /* TDLS Dummy AddSTA does not have qosInfo , is it OK ??
+ */
+ pStaDs->qos.capability.qosInfo = (*(tSirMacQosInfoStation *) &pTdlsAddStaReq->uapsd_queues);
/* populate matching rate set */
-#if 0
-#ifdef WLAN_FEATURE_11AC
- limPopulateMatchingRateSet(pMac, pStaDs, &setupPeerInfo->supportedRates,
- &setupPeerInfo->extendedRates,
- (tANI_U8 *)setupPeerInfo->tdlsPeerHTCaps.supportedMCSSet,
- &pStaDs->mlmStaContext.propRateSet, psessionEntry, NULL);
-#else
- limPopulateMatchingRateSet(pMac, pStaDs, &setupPeerInfo->supportedRates,
- &setupPeerInfo->extendedRates,
- (tANI_U8 *)setupPeerInfo->tdlsPeerHTCaps.supportedMCSSet,
- &pStaDs->mlmStaContext.propRateSet, psessionEntry);
-#endif
-#else
- palCopyMemory( pMac->hHdd, &pStaDs->supportedRates, &pSessStaDs->supportedRates, sizeof(pStaDs->supportedRates));
-#endif
- pStaDs->mlmStaContext.capabilityInfo = pSessStaDs->mlmStaContext.capabilityInfo;// setupPeerInfo->capabilityInfo;
+ /* TDLS Dummy AddSTA does not have HTCap,VHTCap,Rates info , is it OK ??
+ */
+ limTdlsPopulateMatchingRateSet(pMac, pStaDs, pTdlsAddStaReq->supported_rates,
+ pTdlsAddStaReq->supported_rates_length,
+ (tANI_U8 *)pTdlsAddStaReq->htCap.suppMcsSet,
+ &pStaDs->mlmStaContext.propRateSet,
+ psessionEntry, (tDot11fIEVHTCaps *)&pTdlsAddStaReq->vhtCap);
+
+ /* TDLS Dummy AddSTA does not have right capability , is it OK ??
+ */
+ pStaDs->mlmStaContext.capabilityInfo = ( *(tSirMacCapabilityInfo *) &pTdlsAddStaReq->capability);
return ;
}
@@ -3622,7 +4081,7 @@
pStaDs->staType = STA_ENTRY_TDLS_PEER ;
- status = limAddSta(pMac, pStaDs, psessionEntry);
+ status = limAddSta(pMac, pStaDs, false, psessionEntry);
if(eSIR_SUCCESS != status)
{
@@ -3637,15 +4096,15 @@
/*
* Add STA for TDLS setup procedure
*/
-static tSirRetStatus limTdlsSetupAddSta(tpAniSirGlobal pMac,
- tSirMacAddr peerMac, tLimTdlsLinkSetupPeer *setupPeer,
- tpPESession psessionEntry)
+static tSirRetStatus limTdlsSetupAddSta(tpAniSirGlobal pMac,
+ tSirTdlsAddStaReq *pAddStaReq,
+ tpPESession psessionEntry)
{
tpDphHashNode pStaDs = NULL ;
tSirRetStatus status = eSIR_SUCCESS ;
tANI_U16 aid = 0 ;
- pStaDs = dphLookupHashEntry(pMac, peerMac, &aid,
+ pStaDs = dphLookupHashEntry(pMac, pAddStaReq->peerMac, &aid,
&psessionEntry->dph.dphHashTable);
if(NULL == pStaDs)
{
@@ -3654,9 +4113,8 @@
if( !aid )
{
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- ("%s: No more free AID for peer %02x:%02x:%02x:%02x:%02x:%02x"),
- __func__, peerMac[0], peerMac[1], peerMac[2],
- peerMac[3], peerMac[4], peerMac[5]) ;
+ ("%s: No more free AID for peer " MAC_ADDRESS_STR),
+ __func__, MAC_ADDR_ARRAY(pAddStaReq->peerMac)) ;
return eSIR_FAILURE;
}
@@ -3664,9 +4122,8 @@
SET_PEER_AID_BITMAP(psessionEntry->peerAIDBitmap, aid);
VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL,
- ("limTdlsSetupAddSta: Aid = %d, for peer = %02x,%02x,%02x,%02x,%02x,%02x\n"),
- aid, peerMac[0],peerMac[1],peerMac[2],
- peerMac[3],peerMac[4],peerMac[5]) ;
+ ("limTdlsSetupAddSta: Aid = %d, for peer =" MAC_ADDRESS_STR),
+ aid, MAC_ADDR_ARRAY(pAddStaReq->peerMac));
pStaDs = dphGetHashEntry(pMac, aid, &psessionEntry->dph.dphHashTable);
if (pStaDs)
@@ -3675,7 +4132,7 @@
limDeleteDphHashEntry(pMac, pStaDs->staAddr, aid, psessionEntry);
}
- pStaDs = dphAddHashEntry(pMac, peerMac, aid,
+ pStaDs = dphAddHashEntry(pMac, pAddStaReq->peerMac, aid,
&psessionEntry->dph.dphHashTable) ;
if(NULL == pStaDs)
@@ -3686,21 +4143,12 @@
VOS_ASSERT(0) ;
}
}
- else
- {
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR,
- (" there is hash entry for this client\n")) ;
- /*TODO: for now We are returning from here but we should tell
- firmware that station configuration is modified once we
- got that from supplicant*/
- return eSIR_FAILURE;
- }
- limTdlsUpdateHashNodeInfo(pMac, pStaDs, setupPeer, psessionEntry) ;
+ limTdlsUpdateHashNodeInfo(pMac, pStaDs, pAddStaReq, psessionEntry) ;
pStaDs->staType = STA_ENTRY_TDLS_PEER ;
- status = limAddSta(pMac, pStaDs, psessionEntry);
+ status = limAddSta(pMac, pStaDs, (pAddStaReq->tdlsAddOper == TDLS_OPER_UPDATE) ? true: false, psessionEntry);
if(eSIR_SUCCESS != status)
{
@@ -4309,8 +4757,8 @@
* Once Link is setup with PEER, send Add STA ind to SME
*/
static eHalStatus limSendSmeTdlsAddStaRsp(tpAniSirGlobal pMac,
- tANI_U8 sessionId, tSirMacAddr peerMac, tDphHashNode *pStaDs,
- tANI_U8 status)
+ tANI_U8 sessionId, tSirMacAddr peerMac, tANI_U8 updateSta,
+ tDphHashNode *pStaDs, tANI_U8 status)
{
tSirMsgQ mmhMsg = {0} ;
tSirTdlsAddStaRsp *addStaRsp = NULL ;
@@ -4335,6 +4783,11 @@
palCopyMemory( pMac->hHdd, addStaRsp->peerMac,
(tANI_U8 *) peerMac, sizeof(tSirMacAddr));
}
+ if (updateSta)
+ addStaRsp->tdlsAddOper = TDLS_OPER_UPDATE;
+ else
+ addStaRsp->tdlsAddOper = TDLS_OPER_ADD;
+
addStaRsp->length = sizeof(tSirTdlsAddStaRsp) ;
addStaRsp->messageType = eWNI_SME_TDLS_ADD_STA_RSP ;
@@ -4428,7 +4881,7 @@
#endif
add_sta_error:
status = limSendSmeTdlsAddStaRsp(pMac, psessionEntry->smeSessionId,
- pAddStaParams->staMac, pStaDs, status) ;
+ pAddStaParams->staMac, pAddStaParams->updateSta, pStaDs, status) ;
palFreeMemory( pMac->hHdd, (void *) pAddStaParams );
return status ;
}
@@ -4725,7 +5178,6 @@
tSirTdlsAddStaReq *pAddStaReq = (tSirTdlsAddStaReq*) pMsgBuf ;
tpPESession psessionEntry;
tANI_U8 sessionId;
- tLimTdlsLinkSetupPeer setupPeer = {0};
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
("Send Mgmt Recieved\n")) ;
@@ -4764,8 +5216,7 @@
pMac->lim.gLimAddStaTdls = true ;
/* To start with, send add STA request to HAL */
- if(eSIR_FAILURE == limTdlsSetupAddSta(pMac, pAddStaReq->peerMac,
- &setupPeer, psessionEntry))
+ if (eSIR_FAILURE == limTdlsSetupAddSta(pMac, pAddStaReq, psessionEntry))
{
limLog(pMac, LOGE, "%s: Add TDLS Station request failed \n", __func__);
goto lim_tdls_add_sta_error;
@@ -4773,7 +5224,8 @@
return eSIR_SUCCESS;
lim_tdls_add_sta_error:
limSendSmeTdlsAddStaRsp(pMac,
- pAddStaReq->sessionId, pAddStaReq->peerMac, NULL, eSIR_FAILURE );
+ pAddStaReq->sessionId, pAddStaReq->peerMac,
+ (pAddStaReq->tdlsAddOper == TDLS_OPER_UPDATE), NULL, eSIR_FAILURE );
return eSIR_SUCCESS;
}
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index 04a1bc5..bead6aa 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -5523,16 +5523,18 @@
tpBaActivityInd pBaActivityInd;
tpPESession psessionEntry;
tANI_U8 sessionId;
-
+#ifdef FEATURE_WLAN_TDLS
+ boolean htCapable = FALSE;
+#endif
- if(limMsg->bodyptr == NULL)
+ if (limMsg->bodyptr == NULL)
return;
pBaActivityInd = (tpBaActivityInd)limMsg->bodyptr;
baCandidateCnt = pBaActivityInd->baCandidateCnt;
- if((psessionEntry = peFindSessionByBssid(pMac,pBaActivityInd->bssId,&sessionId))== NULL)
+ if ((psessionEntry = peFindSessionByBssid(pMac,pBaActivityInd->bssId,&sessionId))== NULL)
{
limLog(pMac, LOGE,FL("session does not exist for given BSSId\n"));
palFreeMemory(pMac->hHdd, limMsg->bodyptr);
@@ -5540,28 +5542,58 @@
}
//if we are not HT capable we don't need to handle BA timeout indication from HAL.
- if( (baCandidateCnt > pMac->lim.maxStation) || !psessionEntry->htCapability )
+#ifdef FEATURE_WLAN_TDLS
+ if ((baCandidateCnt > pMac->lim.maxStation))
+#else
+ if ((baCandidateCnt > pMac->lim.maxStation) || !psessionEntry->htCapability )
+#endif
{
palFreeMemory(pMac->hHdd, limMsg->bodyptr);
return;
}
+
+#ifdef FEATURE_WLAN_TDLS
+ //if we have TDLS peers, we should look at peers HT capability, which can be different than
+ //AP capability
+ pBaCandidate = (tpAddBaCandidate) (((tANI_U8*)pBaActivityInd) + sizeof(tBaActivityInd));
+
+ for (i=0; i<baCandidateCnt; i++, pBaCandidate++)
+ {
+ pSta = dphLookupHashEntry(pMac, pBaCandidate->staAddr, &assocId, &psessionEntry->dph.dphHashTable);
+ if ((NULL == pSta) || (!pSta->valid))
+ continue;
+
+ if (STA_ENTRY_TDLS_PEER == pSta->staType)
+ htCapable = pSta->mlmStaContext.htCapability;
+ else
+ htCapable = psessionEntry->htCapability;
+
+ if (htCapable)
+ break;
+ }
+ if (!htCapable)
+ {
+ palFreeMemory(pMac->hHdd, limMsg->bodyptr);
+ return;
+ }
+#endif
//delete the complete dialoguetoken linked list
limDeleteDialogueTokenList(pMac);
pBaCandidate = (tpAddBaCandidate) (((tANI_U8*)pBaActivityInd) + sizeof(tBaActivityInd));
- for(i=0; i<baCandidateCnt; i++, pBaCandidate++)
+ for (i=0; i<baCandidateCnt; i++, pBaCandidate++)
{
pSta = dphLookupHashEntry(pMac, pBaCandidate->staAddr, &assocId, &psessionEntry->dph.dphHashTable);
- if( (NULL == pSta) || (!pSta->valid))
- continue;
+ if ((NULL == pSta) || (!pSta->valid))
+ continue;
for (tid=0; tid<STACFG_MAX_TC; tid++)
{
- if( (eBA_DISABLE == pSta->tcCfg[tid].fUseBATx) &&
+ if((eBA_DISABLE == pSta->tcCfg[tid].fUseBATx) &&
(pBaCandidate->baInfo[tid].fBaEnable))
{
- PELOG2(limLog(pMac, LOG2, FL("BA setup for staId = %d, TID: %d, SSN:%d.\n"),
+ PELOG2(limLog(pMac, LOG2, FL("BA setup for staId = %d, TID: %d, SSN: %d"),
pSta->staIndex, tid, pBaCandidate->baInfo[tid].startingSeqNum);)
limPostMlmAddBAReq(pMac, pSta, tid, pBaCandidate->baInfo[tid].startingSeqNum,psessionEntry);
}
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 6dcb185..932a388 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -255,6 +255,17 @@
tCsrBssid *bssid;
}tCsrBSSIDs;
+typedef struct tagCsrStaParams
+{
+ tANI_U16 capability;
+ tANI_U8 extn_capability[SIR_MAC_MAX_EXTN_CAP];
+ tANI_U8 supported_rates_len;
+ tANI_U8 supported_rates[SIR_MAC_MAX_SUPP_RATES];
+ tSirHTCap HTCap;
+ tSirVHTCap VHTCap;
+ tANI_U8 uapsd_queues;
+ tANI_U8 max_sp;
+}tCsrStaParams;
typedef struct tagCsrScanRequest
{
@@ -531,6 +542,7 @@
eCSR_ROAM_RESULT_ASSOC_FAIL_CON_CHANNEL,
#ifdef FEATURE_WLAN_TDLS
eCSR_ROAM_RESULT_ADD_TDLS_PEER,
+ eCSR_ROAM_RESULT_UPDATE_TDLS_PEER,
eCSR_ROAM_RESULT_DELETE_TDLS_PEER,
eCSR_ROAM_RESULT_TEARDOWN_TDLS_PEER_IND,
eCSR_ROAM_RESULT_DELETE_ALL_TDLS_PEER_IND,
diff --git a/CORE/SME/inc/smeInside.h b/CORE/SME/inc/smeInside.h
index 80c62c4..86b5f81 100644
--- a/CORE/SME/inc/smeInside.h
+++ b/CORE/SME/inc/smeInside.h
@@ -134,7 +134,16 @@
typedef struct TdlsAddStaInfo
{
+ eTdlsAddOper tdlsAddOper;
tSirMacAddr peerMac;
+ tANI_U16 capability;
+ tANI_U8 extnCapability[SIR_MAC_MAX_EXTN_CAP];
+ tANI_U8 supportedRatesLen;
+ tANI_U8 supportedRates[SIR_MAC_MAX_SUPP_RATES];
+ tSirHTCap HTCap;
+ tSirVHTCap VHTCap;
+ tANI_U8 uapsdQueues;
+ tANI_U8 maxSp;
} tTdlsAddStaCmdInfo;
typedef struct TdlsDelStaInfo
@@ -283,6 +292,7 @@
#ifdef FEATURE_WLAN_TDLS
eHalStatus csrTdlsSendMgmtReq(tHalHandle hHal, tANI_U8 sessionId, tCsrTdlsSendMgmt *tdlsSendMgmt);
eHalStatus csrTdlsAddPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac);
+eHalStatus csrTdlsChangePeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac, tCsrStaParams *pstaParams);
eHalStatus csrTdlsDelPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac);
eHalStatus csrTdlsProcessCmd(tpAniSirGlobal pMac,tSmeCmd *pCommand );
eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac,v_U16_t msg_type,
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 80fd4fe..dc7dcc9 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -2494,6 +2494,16 @@
VOS_STATUS sme_SendTdlsMgmtFrame(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac,
tANI_U8 frame_type, tANI_U8 dialog, tANI_U16 status, tANI_U8 *buf, tANI_U8 len, tANI_U8 responder);
/* ---------------------------------------------------------------------------
+ \fn sme_ChangeTdlsPeerSta
+ \brief API to Update TDLS peer sta parameters.
+
+ \param peerMac - peer's Mac Adress.
+ \param staParams - Peer Station Parameters.
+ \- return VOS_STATUS_SUCCES
+ -------------------------------------------------------------------------*/
+VOS_STATUS sme_ChangeTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac,
+ tCsrStaParams *pstaParams);
+/* ---------------------------------------------------------------------------
\fn sme_AddTdlsPeerSta
\brief API to Add TDLS peer sta entry.
diff --git a/CORE/SME/src/csr/csrTdlsProcess.c b/CORE/SME/src/csr/csrTdlsProcess.c
index abc6cb8..e1d07f1 100644
--- a/CORE/SME/src/csr/csrTdlsProcess.c
+++ b/CORE/SME/src/csr/csrTdlsProcess.c
@@ -175,6 +175,64 @@
/*
* TDLS request API, called from HDD to add a TDLS peer
*/
+eHalStatus csrTdlsChangePeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac,
+ tCsrStaParams *pstaParams)
+{
+ tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
+ tSmeCmd *tdlsAddStaCmd ;
+ eHalStatus status = eHAL_STATUS_FAILURE ;
+
+ //If connected and in Infra. Only then allow this
+ if (CSR_IS_SESSION_VALID( pMac, sessionId ) &&
+ csrIsConnStateConnectedInfra( pMac, sessionId ) &&
+ (NULL != peerMac)){
+
+ tdlsAddStaCmd = csrGetCommandBuffer(pMac) ;
+
+ if (tdlsAddStaCmd)
+ {
+ tTdlsAddStaCmdInfo *tdlsAddStaCmdInfo =
+ &tdlsAddStaCmd->u.tdlsCmd.u.tdlsAddStaCmdInfo ;
+
+ tdlsAddStaCmdInfo->tdlsAddOper = TDLS_OPER_UPDATE;
+
+ tdlsAddStaCmd->sessionId = sessionId;
+
+ palCopyMemory(pMac->hHdd, tdlsAddStaCmdInfo->peerMac,
+ peerMac, sizeof(tSirMacAddr)) ;
+ tdlsAddStaCmdInfo->capability = pstaParams->capability;
+ tdlsAddStaCmdInfo->uapsdQueues = pstaParams->uapsd_queues;
+ tdlsAddStaCmdInfo->maxSp = pstaParams->max_sp;
+ palCopyMemory(pMac->hHdd, tdlsAddStaCmdInfo->extnCapability,
+ pstaParams->extn_capability,
+ sizeof(pstaParams->extn_capability));
+
+ palCopyMemory(pMac->hHdd, &tdlsAddStaCmdInfo->HTCap,
+ &pstaParams->HTCap, sizeof(pstaParams->HTCap));
+
+ palCopyMemory(pMac->hHdd, &tdlsAddStaCmdInfo->VHTCap,
+ &pstaParams->VHTCap, sizeof(pstaParams->VHTCap));
+
+ tdlsAddStaCmdInfo->supportedRatesLen = pstaParams->supported_rates_len;
+
+ if (0 != pstaParams->supported_rates_len)
+ palCopyMemory(pMac->hHdd, &tdlsAddStaCmdInfo->supportedRates,
+ pstaParams->supported_rates,
+ pstaParams->supported_rates_len);
+
+ tdlsAddStaCmd->command = eSmeCommandTdlsAddPeer;
+ tdlsAddStaCmd->u.tdlsCmd.size = sizeof(tTdlsAddStaCmdInfo) ;
+ smePushCommand(pMac, tdlsAddStaCmd, FALSE) ;
+ status = eHAL_STATUS_SUCCESS ;
+ }
+ }
+
+ return status ;
+}
+
+/*
+ * TDLS request API, called from HDD to add a TDLS peer
+ */
eHalStatus csrTdlsAddPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac)
{
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
@@ -194,6 +252,7 @@
&tdlsAddStaCmd->u.tdlsCmd.u.tdlsAddStaCmdInfo ;
tdlsAddStaCmd->sessionId = sessionId;
+ tdlsAddStaCmdInfo->tdlsAddOper = TDLS_OPER_ADD;
palCopyMemory(pMac->hHdd, tdlsAddStaCmdInfo->peerMac,
peerMac, sizeof(tSirMacAddr)) ;
@@ -209,7 +268,7 @@
}
/*
- * TDLS request API, called from HDD to delete a TDLS peer
+ * TDLS request API, called from HDD to delete a TDLS peer
*/
eHalStatus csrTdlsDelPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac)
{
@@ -447,6 +506,7 @@
return status ;
}
tdlsAddStaReq->sessionId = cmd->sessionId;
+ tdlsAddStaReq->tdlsAddOper = tdlsAddStaCmdInfo->tdlsAddOper;
//Using dialog as transactionId. This can be used to match response with request
tdlsAddStaReq->transactionId = 0;
@@ -464,6 +524,21 @@
palCopyMemory(pMac->hHdd, tdlsAddStaReq->peerMac,
tdlsAddStaCmdInfo->peerMac, sizeof(tSirMacAddr)) ;
+ tdlsAddStaReq->capability = tdlsAddStaCmdInfo->capability;
+ tdlsAddStaReq->uapsd_queues = tdlsAddStaCmdInfo->uapsdQueues;
+ tdlsAddStaReq->max_sp = tdlsAddStaCmdInfo->maxSp;
+
+ palCopyMemory(pMac->hHdd, tdlsAddStaReq->extn_capability,
+ tdlsAddStaCmdInfo->extnCapability,
+ SIR_MAC_MAX_EXTN_CAP);
+ palCopyMemory(pMac->hHdd, &tdlsAddStaReq->htCap,
+ &tdlsAddStaCmdInfo->HTCap, sizeof(tdlsAddStaCmdInfo->HTCap));
+ palCopyMemory(pMac->hHdd, &tdlsAddStaReq->vhtCap,
+ &tdlsAddStaCmdInfo->VHTCap, sizeof(tdlsAddStaCmdInfo->VHTCap));
+ tdlsAddStaReq->supported_rates_length = tdlsAddStaCmdInfo->supportedRatesLen;
+ palCopyMemory(pMac->hHdd, &tdlsAddStaReq->supported_rates,
+ tdlsAddStaCmdInfo->supportedRates, tdlsAddStaCmdInfo->supportedRatesLen);
+
// Send the request to PE.
smsLog( pMac, LOGE, "sending TDLS Add Sta req to PE \n" );
status = tdlsSendMessage(pMac, eWNI_SME_TDLS_ADD_STA_REQ,
@@ -823,6 +898,7 @@
case eWNI_SME_TDLS_ADD_STA_RSP:
{
tSirTdlsAddStaRsp *addStaRsp = (tSirTdlsAddStaRsp *) pMsgBuf ;
+ eCsrRoamResult roamResult ;
tCsrRoamInfo roamInfo = {0} ;
palCopyMemory(pMac->hHdd, &roamInfo.peerMac, addStaRsp->peerMac,
sizeof(tSirMacAddr)) ;
@@ -834,9 +910,13 @@
* register peer with TL, we have to go through HDD as this is
* the only way to register any STA with TL.
*/
+ if (addStaRsp->tdlsAddOper == TDLS_OPER_ADD)
+ roamResult = eCSR_ROAM_RESULT_ADD_TDLS_PEER;
+ else if (addStaRsp->tdlsAddOper == TDLS_OPER_UPDATE)
+ roamResult = eCSR_ROAM_RESULT_UPDATE_TDLS_PEER;
csrRoamCallCallback(pMac, addStaRsp->sessionId, &roamInfo, 0,
eCSR_ROAM_TDLS_STATUS_UPDATE,
- eCSR_ROAM_RESULT_ADD_TDLS_PEER);
+ roamResult);
/* remove pending eSmeCommandTdlsDiscovery command */
csrTdlsRemoveSmeCmd(pMac, eSmeCommandTdlsAddPeer) ;
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index cc98b82..459ec61 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -2214,7 +2214,7 @@
}
else
{
- ret = WNI_CFG_DOT11_MODE_11N;
+ ret = WNI_CFG_DOT11_MODE_11AC;
}
break;
case eCSR_CFG_DOT11_MODE_TAURUS:
@@ -6006,7 +6006,7 @@
}
else
{
- cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N;
+ cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC;
}
break;
case eCSR_DOT11_MODE_11ac_ONLY:
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 748f2c6..48c2e0c 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -7406,6 +7406,32 @@
}
/* ---------------------------------------------------------------------------
+ \fn sme_ChangeTdlsPeerSta
+ \brief API to Update TDLS peer sta parameters.
+
+ \param peerMac - peer's Mac Adress.
+ \param staParams - Peer Station Parameters
+ \- return VOS_STATUS_SUCCES
+ -------------------------------------------------------------------------*/
+VOS_STATUS sme_ChangeTdlsPeerSta(tHalHandle hHal, tANI_U8 sessionId, tSirMacAddr peerMac,
+ tCsrStaParams *pstaParams)
+{
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+ tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
+
+ status = sme_AcquireGlobalLock( &pMac->sme );
+ if ( HAL_STATUS_SUCCESS( status ) )
+ {
+ status = csrTdlsChangePeerSta(hHal, sessionId, peerMac,pstaParams);
+
+ sme_ReleaseGlobalLock( &pMac->sme );
+ }
+
+ return status ;
+
+}
+
+/* ---------------------------------------------------------------------------
\fn sme_AddTdlsPeerSta
\brief API to Add TDLS peer sta entry.
diff --git a/CORE/SYS/legacy/src/utils/src/dot11f.c b/CORE/SYS/legacy/src/utils/src/dot11f.c
index 5eeaa87..e36cfd2 100644
--- a/CORE/SYS/legacy/src/utils/src/dot11f.c
+++ b/CORE/SYS/legacy/src/utils/src/dot11f.c
@@ -50,7 +50,7 @@
*
*
* This file was automatically generated by 'framesc'
- * Wed Mar 6 12:08:58 2013 from the following file(s):
+ * Fri Mar 1 23:01:44 2013 from the following file(s):
*
* dot11f.frms
*
@@ -2710,6 +2710,20 @@
#define SigIeWMMTSPEC ( 0x002b )
+tANI_U32 dot11fUnpackIeAID(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEAID *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->assocId, pBuf, 0);
+ (void)pCtx;
+ return status;
+} /* End dot11fUnpackIeAID. */
+
+#define SigIeAID ( 0x002c )
+
+
static const tFFDefn FFS_Airgo[ ] = {
{ NULL, 0, 0, 0,},
};
@@ -2752,7 +2766,7 @@
return status;
} /* End dot11fUnpackIeAirgo. */
-#define SigIeAirgo ( 0x002c )
+#define SigIeAirgo ( 0x002d )
tANI_U32 dot11fUnpackIeCCXCckmOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXCckmOpaque *pDst)
@@ -2772,7 +2786,7 @@
return status;
} /* End dot11fUnpackIeCCXCckmOpaque. */
-#define SigIeCCXCckmOpaque ( 0x002d )
+#define SigIeCCXCckmOpaque ( 0x002e )
tANI_U32 dot11fUnpackIeCCXRadMgmtCap(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXRadMgmtCap *pDst)
@@ -2792,7 +2806,7 @@
return status;
} /* End dot11fUnpackIeCCXRadMgmtCap. */
-#define SigIeCCXRadMgmtCap ( 0x002e )
+#define SigIeCCXRadMgmtCap ( 0x002f )
tANI_U32 dot11fUnpackIeCCXTrafStrmMet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXTrafStrmMet *pDst)
@@ -2812,7 +2826,7 @@
return status;
} /* End dot11fUnpackIeCCXTrafStrmMet. */
-#define SigIeCCXTrafStrmMet ( 0x002f )
+#define SigIeCCXTrafStrmMet ( 0x0030 )
tANI_U32 dot11fUnpackIeCCXTrafStrmRateSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXTrafStrmRateSet *pDst)
@@ -2835,7 +2849,7 @@
return status;
} /* End dot11fUnpackIeCCXTrafStrmRateSet. */
-#define SigIeCCXTrafStrmRateSet ( 0x0030 )
+#define SigIeCCXTrafStrmRateSet ( 0x0031 )
tANI_U32 dot11fUnpackIeCCXTxmitPower(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXTxmitPower *pDst)
@@ -2852,7 +2866,7 @@
return status;
} /* End dot11fUnpackIeCCXTxmitPower. */
-#define SigIeCCXTxmitPower ( 0x0031 )
+#define SigIeCCXTxmitPower ( 0x0032 )
tANI_U32 dot11fUnpackIeCCXVersion(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXVersion *pDst)
@@ -2866,7 +2880,7 @@
return status;
} /* End dot11fUnpackIeCCXVersion. */
-#define SigIeCCXVersion ( 0x0032 )
+#define SigIeCCXVersion ( 0x0033 )
tANI_U32 dot11fUnpackIeCFParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECFParams *pDst)
@@ -2889,7 +2903,7 @@
return status;
} /* End dot11fUnpackIeCFParams. */
-#define SigIeCFParams ( 0x0033 )
+#define SigIeCFParams ( 0x0034 )
tANI_U32 dot11fUnpackIeChallengeText(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEChallengeText *pDst)
@@ -2909,7 +2923,7 @@
return status;
} /* End dot11fUnpackIeChallengeText. */
-#define SigIeChallengeText ( 0x0034 )
+#define SigIeChallengeText ( 0x0035 )
tANI_U32 dot11fUnpackIeChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEChanSwitchAnn *pDst)
@@ -2929,7 +2943,7 @@
return status;
} /* End dot11fUnpackIeChanSwitchAnn. */
-#define SigIeChanSwitchAnn ( 0x0035 )
+#define SigIeChanSwitchAnn ( 0x0036 )
tANI_U32 dot11fUnpackIeCountry(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECountry *pDst)
@@ -2960,10 +2974,10 @@
return status;
} /* End dot11fUnpackIeCountry. */
-#define SigIeCountry ( 0x0036 )
+#define SigIeCountry ( 0x0037 )
-#define SigIeDSParams ( 0x0037 )
+#define SigIeDSParams ( 0x0038 )
tANI_U32 dot11fUnpackIeEDCAParamSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEEDCAParamSet *pDst)
@@ -3048,7 +3062,7 @@
return status;
} /* End dot11fUnpackIeEDCAParamSet. */
-#define SigIeEDCAParamSet ( 0x0038 )
+#define SigIeEDCAParamSet ( 0x0039 )
tANI_U32 dot11fUnpackIeERPInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEERPInfo *pDst)
@@ -3067,7 +3081,7 @@
return status;
} /* End dot11fUnpackIeERPInfo. */
-#define SigIeERPInfo ( 0x0039 )
+#define SigIeERPInfo ( 0x003a )
tANI_U32 dot11fUnpackIeExtCap(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEExtCap *pDst)
@@ -3141,10 +3155,10 @@
return status;
} /* End dot11fUnpackIeExtCap. */
-#define SigIeExtCap ( 0x003a )
+#define SigIeExtCap ( 0x003b )
-#define SigIeExtChanSwitchAnn ( 0x003b )
+#define SigIeExtChanSwitchAnn ( 0x003c )
tANI_U32 dot11fUnpackIeExtSuppRates(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEExtSuppRates *pDst)
@@ -3172,7 +3186,7 @@
return status;
} /* End dot11fUnpackIeExtSuppRates. */
-#define SigIeExtSuppRates ( 0x003c )
+#define SigIeExtSuppRates ( 0x003d )
tANI_U32 dot11fUnpackIeFHParamSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEFHParamSet *pDst)
@@ -3195,7 +3209,7 @@
return status;
} /* End dot11fUnpackIeFHParamSet. */
-#define SigIeFHParamSet ( 0x003d )
+#define SigIeFHParamSet ( 0x003e )
tANI_U32 dot11fUnpackIeFHParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEFHParams *pDst)
@@ -3212,7 +3226,7 @@
return status;
} /* End dot11fUnpackIeFHParams. */
-#define SigIeFHParams ( 0x003e )
+#define SigIeFHParams ( 0x003f )
tANI_U32 dot11fUnpackIeFHPattTable(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEFHPattTable *pDst)
@@ -3244,7 +3258,7 @@
return status;
} /* End dot11fUnpackIeFHPattTable. */
-#define SigIeFHPattTable ( 0x003f )
+#define SigIeFHPattTable ( 0x0040 )
static const tFFDefn FFS_FTInfo[ ] = {
@@ -3290,7 +3304,7 @@
return status;
} /* End dot11fUnpackIeFTInfo. */
-#define SigIeFTInfo ( 0x0040 )
+#define SigIeFTInfo ( 0x0041 )
tANI_U32 dot11fUnpackIeFTTimeoutInterval(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEFTTimeoutInterval *pDst)
@@ -3307,7 +3321,7 @@
return status;
} /* End dot11fUnpackIeFTTimeoutInterval. */
-#define SigIeFTTimeoutInterval ( 0x0041 )
+#define SigIeFTTimeoutInterval ( 0x0042 )
tANI_U32 dot11fUnpackIeHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEHTCaps *pDst)
@@ -3396,7 +3410,7 @@
return status;
} /* End dot11fUnpackIeHTCaps. */
-#define SigIeHTCaps ( 0x0042 )
+#define SigIeHTCaps ( 0x0043 )
tANI_U32 dot11fUnpackIeHTInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEHTInfo *pDst)
@@ -3451,7 +3465,7 @@
return status;
} /* End dot11fUnpackIeHTInfo. */
-#define SigIeHTInfo ( 0x0043 )
+#define SigIeHTInfo ( 0x0044 )
tANI_U32 dot11fUnpackIeIBSSParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEIBSSParams *pDst)
@@ -3465,7 +3479,7 @@
return status;
} /* End dot11fUnpackIeIBSSParams. */
-#define SigIeIBSSParams ( 0x0044 )
+#define SigIeIBSSParams ( 0x0045 )
tANI_U32 dot11fUnpackIeLinkIdentifier(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIELinkIdentifier *pDst)
@@ -3485,7 +3499,7 @@
return status;
} /* End dot11fUnpackIeLinkIdentifier. */
-#define SigIeLinkIdentifier ( 0x0045 )
+#define SigIeLinkIdentifier ( 0x0046 )
static const tFFDefn FFS_reportBeacon[ ] = {
@@ -3643,7 +3657,7 @@
return status;
} /* End dot11fUnpackIeMeasurementReport. */
-#define SigIeMeasurementReport ( 0x0046 )
+#define SigIeMeasurementReport ( 0x0047 )
static const tFFDefn FFS_measurement_requestBeacon[ ] = {
@@ -3748,7 +3762,7 @@
return status;
} /* End dot11fUnpackIeMeasurementRequest. */
-#define SigIeMeasurementRequest ( 0x0047 )
+#define SigIeMeasurementRequest ( 0x0048 )
tANI_U32 dot11fUnpackIeMobilityDomain(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEMobilityDomain *pDst)
@@ -3769,7 +3783,7 @@
return status;
} /* End dot11fUnpackIeMobilityDomain. */
-#define SigIeMobilityDomain ( 0x0048 )
+#define SigIeMobilityDomain ( 0x0049 )
static const tFFDefn FFS_NeighborReport[ ] = {
@@ -3836,7 +3850,7 @@
return status;
} /* End dot11fUnpackIeNeighborReport. */
-#define SigIeNeighborReport ( 0x0049 )
+#define SigIeNeighborReport ( 0x004a )
tANI_U32 dot11fUnpackIeOperatingMode(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEOperatingMode *pDst)
@@ -3855,7 +3869,7 @@
return status;
} /* End dot11fUnpackIeOperatingMode. */
-#define SigIeOperatingMode ( 0x004a )
+#define SigIeOperatingMode ( 0x004b )
static const tTLVDefn TLVS_P2PAssocReq[ ] = {
@@ -3874,7 +3888,7 @@
return status;
} /* End dot11fUnpackIeP2PAssocReq. */
-#define SigIeP2PAssocReq ( 0x004b )
+#define SigIeP2PAssocReq ( 0x004c )
static const tTLVDefn TLVS_P2PAssocRes[ ] = {
@@ -3892,7 +3906,7 @@
return status;
} /* End dot11fUnpackIeP2PAssocRes. */
-#define SigIeP2PAssocRes ( 0x004c )
+#define SigIeP2PAssocRes ( 0x004d )
static const tTLVDefn TLVS_P2PBeacon[ ] = {
@@ -3911,7 +3925,7 @@
return status;
} /* End dot11fUnpackIeP2PBeacon. */
-#define SigIeP2PBeacon ( 0x004d )
+#define SigIeP2PBeacon ( 0x004e )
static const tTLVDefn TLVS_P2PBeaconProbeRes[ ] = {
@@ -3933,7 +3947,7 @@
return status;
} /* End dot11fUnpackIeP2PBeaconProbeRes. */
-#define SigIeP2PBeaconProbeRes ( 0x004e )
+#define SigIeP2PBeaconProbeRes ( 0x004f )
static const tTLVDefn TLVS_P2PDeAuth[ ] = {
@@ -3950,7 +3964,7 @@
return status;
} /* End dot11fUnpackIeP2PDeAuth. */
-#define SigIeP2PDeAuth ( 0x004f )
+#define SigIeP2PDeAuth ( 0x0050 )
static const tTLVDefn TLVS_P2PDeviceDiscoverabilityReq[ ] = {
@@ -3968,7 +3982,7 @@
return status;
} /* End dot11fUnpackIeP2PDeviceDiscoverabilityReq. */
-#define SigIeP2PDeviceDiscoverabilityReq ( 0x0050 )
+#define SigIeP2PDeviceDiscoverabilityReq ( 0x0051 )
static const tTLVDefn TLVS_P2PDeviceDiscoverabilityRes[ ] = {
@@ -3985,7 +3999,7 @@
return status;
} /* End dot11fUnpackIeP2PDeviceDiscoverabilityRes. */
-#define SigIeP2PDeviceDiscoverabilityRes ( 0x0051 )
+#define SigIeP2PDeviceDiscoverabilityRes ( 0x0052 )
static const tTLVDefn TLVS_P2PDisAssoc[ ] = {
@@ -4002,7 +4016,7 @@
return status;
} /* End dot11fUnpackIeP2PDisAssoc. */
-#define SigIeP2PDisAssoc ( 0x0052 )
+#define SigIeP2PDisAssoc ( 0x0053 )
static const tTLVDefn TLVS_P2PGONegCnf[ ] = {
@@ -4023,7 +4037,7 @@
return status;
} /* End dot11fUnpackIeP2PGONegCnf. */
-#define SigIeP2PGONegCnf ( 0x0053 )
+#define SigIeP2PGONegCnf ( 0x0054 )
static const tTLVDefn TLVS_P2PGONegReq[ ] = {
@@ -4048,7 +4062,7 @@
return status;
} /* End dot11fUnpackIeP2PGONegReq. */
-#define SigIeP2PGONegReq ( 0x0054 )
+#define SigIeP2PGONegReq ( 0x0055 )
static const tTLVDefn TLVS_P2PGONegRes[ ] = {
@@ -4073,7 +4087,7 @@
return status;
} /* End dot11fUnpackIeP2PGONegRes. */
-#define SigIeP2PGONegRes ( 0x0055 )
+#define SigIeP2PGONegRes ( 0x0056 )
static const tTLVDefn TLVS_P2PGONegWPS[ ] = {
@@ -4091,7 +4105,7 @@
return status;
} /* End dot11fUnpackIeP2PGONegWPS. */
-#define SigIeP2PGONegWPS ( 0x0056 )
+#define SigIeP2PGONegWPS ( 0x0057 )
tANI_U32 dot11fUnpackIeP2PIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEP2PIEOpaque *pDst)
@@ -4111,7 +4125,7 @@
return status;
} /* End dot11fUnpackIeP2PIEOpaque. */
-#define SigIeP2PIEOpaque ( 0x0057 )
+#define SigIeP2PIEOpaque ( 0x0058 )
static const tTLVDefn TLVS_P2PInvitationReq[ ] = {
@@ -4134,7 +4148,7 @@
return status;
} /* End dot11fUnpackIeP2PInvitationReq. */
-#define SigIeP2PInvitationReq ( 0x0058 )
+#define SigIeP2PInvitationReq ( 0x0059 )
static const tTLVDefn TLVS_P2PInvitationRes[ ] = {
@@ -4155,7 +4169,7 @@
return status;
} /* End dot11fUnpackIeP2PInvitationRes. */
-#define SigIeP2PInvitationRes ( 0x0059 )
+#define SigIeP2PInvitationRes ( 0x005a )
static const tTLVDefn TLVS_P2PNoticeOfAbsence[ ] = {
@@ -4172,7 +4186,7 @@
return status;
} /* End dot11fUnpackIeP2PNoticeOfAbsence. */
-#define SigIeP2PNoticeOfAbsence ( 0x005a )
+#define SigIeP2PNoticeOfAbsence ( 0x005b )
static const tTLVDefn TLVS_P2PPresenceResponse[ ] = {
@@ -4190,7 +4204,7 @@
return status;
} /* End dot11fUnpackIeP2PPresenceResponse. */
-#define SigIeP2PPresenceResponse ( 0x005b )
+#define SigIeP2PPresenceResponse ( 0x005c )
static const tTLVDefn TLVS_P2PProbeReq[ ] = {
@@ -4211,7 +4225,7 @@
return status;
} /* End dot11fUnpackIeP2PProbeReq. */
-#define SigIeP2PProbeReq ( 0x005c )
+#define SigIeP2PProbeReq ( 0x005d )
static const tTLVDefn TLVS_P2PProbeRes[ ] = {
@@ -4232,7 +4246,7 @@
return status;
} /* End dot11fUnpackIeP2PProbeRes. */
-#define SigIeP2PProbeRes ( 0x005d )
+#define SigIeP2PProbeRes ( 0x005e )
static const tTLVDefn TLVS_P2PProvisionDiscoveryReq[ ] = {
@@ -4251,7 +4265,7 @@
return status;
} /* End dot11fUnpackIeP2PProvisionDiscoveryReq. */
-#define SigIeP2PProvisionDiscoveryReq ( 0x005e )
+#define SigIeP2PProvisionDiscoveryReq ( 0x005f )
static const tTLVDefn TLVS_P2PWSCProvisionDiscoveryRes[ ] = {
@@ -4268,7 +4282,7 @@
return status;
} /* End dot11fUnpackIeP2PWSCProvisionDiscoveryRes. */
-#define SigIeP2PWSCProvisionDiscoveryRes ( 0x005f )
+#define SigIeP2PWSCProvisionDiscoveryRes ( 0x0060 )
tANI_U32 dot11fUnpackIePTIControl(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPTIControl *pDst)
@@ -4285,7 +4299,7 @@
return status;
} /* End dot11fUnpackIePTIControl. */
-#define SigIePTIControl ( 0x0060 )
+#define SigIePTIControl ( 0x0061 )
tANI_U32 dot11fUnpackIePUBufferStatus(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPUBufferStatus *pDst)
@@ -4305,7 +4319,7 @@
return status;
} /* End dot11fUnpackIePUBufferStatus. */
-#define SigIePUBufferStatus ( 0x0061 )
+#define SigIePUBufferStatus ( 0x0062 )
tANI_U32 dot11fUnpackIePowerCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPowerCaps *pDst)
@@ -4322,7 +4336,7 @@
return status;
} /* End dot11fUnpackIePowerCaps. */
-#define SigIePowerCaps ( 0x0062 )
+#define SigIePowerCaps ( 0x0063 )
tANI_U32 dot11fUnpackIePowerConstraints(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPowerConstraints *pDst)
@@ -4336,7 +4350,7 @@
return status;
} /* End dot11fUnpackIePowerConstraints. */
-#define SigIePowerConstraints ( 0x0063 )
+#define SigIePowerConstraints ( 0x0064 )
tANI_U32 dot11fUnpackIeQBSSLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQBSSLoad *pDst)
@@ -4356,7 +4370,7 @@
return status;
} /* End dot11fUnpackIeQBSSLoad. */
-#define SigIeQBSSLoad ( 0x0064 )
+#define SigIeQBSSLoad ( 0x0065 )
tANI_U32 dot11fUnpackIeQOSCapsAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQOSCapsAp *pDst)
@@ -4376,7 +4390,7 @@
return status;
} /* End dot11fUnpackIeQOSCapsAp. */
-#define SigIeQOSCapsAp ( 0x0065 )
+#define SigIeQOSCapsAp ( 0x0066 )
tANI_U32 dot11fUnpackIeQOSCapsStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQOSCapsStation *pDst)
@@ -4398,7 +4412,7 @@
return status;
} /* End dot11fUnpackIeQOSCapsStation. */
-#define SigIeQOSCapsStation ( 0x0066 )
+#define SigIeQOSCapsStation ( 0x0067 )
tANI_U32 dot11fUnpackIeQuiet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQuiet *pDst)
@@ -4421,7 +4435,7 @@
return status;
} /* End dot11fUnpackIeQuiet. */
-#define SigIeQuiet ( 0x0067 )
+#define SigIeQuiet ( 0x0068 )
tANI_U32 dot11fUnpackIeRCPIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERCPIIE *pDst)
@@ -4435,7 +4449,7 @@
return status;
} /* End dot11fUnpackIeRCPIIE. */
-#define SigIeRCPIIE ( 0x0068 )
+#define SigIeRCPIIE ( 0x0069 )
static const tFFDefn FFS_RICDataDesc[ ] = {
@@ -4475,7 +4489,7 @@
return status;
} /* End dot11fUnpackIeRICDataDesc. */
-#define SigIeRICDataDesc ( 0x0069 )
+#define SigIeRICDataDesc ( 0x006a )
tANI_U32 dot11fUnpackIeRSN(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSN *pDst)
@@ -4568,7 +4582,7 @@
return status;
} /* End dot11fUnpackIeRSN. */
-#define SigIeRSN ( 0x006a )
+#define SigIeRSN ( 0x006b )
tANI_U32 dot11fUnpackIeRSNIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSNIIE *pDst)
@@ -4582,7 +4596,7 @@
return status;
} /* End dot11fUnpackIeRSNIIE. */
-#define SigIeRSNIIE ( 0x006b )
+#define SigIeRSNIIE ( 0x006c )
tANI_U32 dot11fUnpackIeRSNOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSNOpaque *pDst)
@@ -4602,7 +4616,7 @@
return status;
} /* End dot11fUnpackIeRSNOpaque. */
-#define SigIeRSNOpaque ( 0x006c )
+#define SigIeRSNOpaque ( 0x006d )
tANI_U32 dot11fUnpackIeSuppChannels(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppChannels *pDst)
@@ -4622,7 +4636,7 @@
return status;
} /* End dot11fUnpackIeSuppChannels. */
-#define SigIeSuppChannels ( 0x006d )
+#define SigIeSuppChannels ( 0x006e )
tANI_U32 dot11fUnpackIeSuppRates(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppRates *pDst)
@@ -4650,7 +4664,7 @@
return status;
} /* End dot11fUnpackIeSuppRates. */
-#define SigIeSuppRates ( 0x006e )
+#define SigIeSuppRates ( 0x006f )
tANI_U32 dot11fUnpackIeTIM(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETIM *pDst)
@@ -4679,7 +4693,7 @@
return status;
} /* End dot11fUnpackIeTIM. */
-#define SigIeTIM ( 0x006f )
+#define SigIeTIM ( 0x0070 )
tANI_U32 dot11fUnpackIeTPCReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETPCReport *pDst)
@@ -4696,7 +4710,7 @@
return status;
} /* End dot11fUnpackIeTPCReport. */
-#define SigIeTPCReport ( 0x0070 )
+#define SigIeTPCReport ( 0x0071 )
tANI_U32 dot11fUnpackIeTPCRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETPCRequest *pDst)
@@ -4709,7 +4723,7 @@
return status;
} /* End dot11fUnpackIeTPCRequest. */
-#define SigIeTPCRequest ( 0x0071 )
+#define SigIeTPCRequest ( 0x0072 )
tANI_U32 dot11fUnpackIeVHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTCaps *pDst)
@@ -4762,7 +4776,7 @@
return status;
} /* End dot11fUnpackIeVHTCaps. */
-#define SigIeVHTCaps ( 0x0072 )
+#define SigIeVHTCaps ( 0x0073 )
tANI_U32 dot11fUnpackIeVHTExtBssLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTExtBssLoad *pDst)
@@ -4788,7 +4802,7 @@
return status;
} /* End dot11fUnpackIeVHTExtBssLoad. */
-#define SigIeVHTExtBssLoad ( 0x0073 )
+#define SigIeVHTExtBssLoad ( 0x0074 )
tANI_U32 dot11fUnpackIeVHTOperation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTOperation *pDst)
@@ -4811,7 +4825,7 @@
return status;
} /* End dot11fUnpackIeVHTOperation. */
-#define SigIeVHTOperation ( 0x0074 )
+#define SigIeVHTOperation ( 0x0075 )
tANI_U32 dot11fUnpackIeWAPI(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWAPI *pDst)
@@ -4880,7 +4894,7 @@
return status;
} /* End dot11fUnpackIeWAPI. */
-#define SigIeWAPI ( 0x0075 )
+#define SigIeWAPI ( 0x0076 )
tANI_U32 dot11fUnpackIeWAPIOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWAPIOpaque *pDst)
@@ -4900,7 +4914,7 @@
return status;
} /* End dot11fUnpackIeWAPIOpaque. */
-#define SigIeWAPIOpaque ( 0x0076 )
+#define SigIeWAPIOpaque ( 0x0077 )
tANI_U32 dot11fUnpackIeWFATPC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWFATPC *pDst)
@@ -4917,7 +4931,7 @@
return status;
} /* End dot11fUnpackIeWFATPC. */
-#define SigIeWFATPC ( 0x0077 )
+#define SigIeWFATPC ( 0x0078 )
tANI_U32 dot11fUnpackIeWFDIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWFDIEOpaque *pDst)
@@ -4937,7 +4951,7 @@
return status;
} /* End dot11fUnpackIeWFDIEOpaque. */
-#define SigIeWFDIEOpaque ( 0x0078 )
+#define SigIeWFDIEOpaque ( 0x0079 )
tANI_U32 dot11fUnpackIeWMMCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMCaps *pDst)
@@ -4965,7 +4979,7 @@
return status;
} /* End dot11fUnpackIeWMMCaps. */
-#define SigIeWMMCaps ( 0x0079 )
+#define SigIeWMMCaps ( 0x007a )
tANI_U32 dot11fUnpackIeWMMInfoAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoAp *pDst)
@@ -4986,7 +5000,7 @@
return status;
} /* End dot11fUnpackIeWMMInfoAp. */
-#define SigIeWMMInfoAp ( 0x007a )
+#define SigIeWMMInfoAp ( 0x007b )
tANI_U32 dot11fUnpackIeWMMInfoStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoStation *pDst)
@@ -5011,7 +5025,7 @@
return status;
} /* End dot11fUnpackIeWMMInfoStation. */
-#define SigIeWMMInfoStation ( 0x007b )
+#define SigIeWMMInfoStation ( 0x007c )
tANI_U32 dot11fUnpackIeWMMParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMParams *pDst)
@@ -5104,7 +5118,7 @@
return status;
} /* End dot11fUnpackIeWMMParams. */
-#define SigIeWMMParams ( 0x007c )
+#define SigIeWMMParams ( 0x007d )
tANI_U32 dot11fUnpackIeWPA(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWPA *pDst)
@@ -5186,7 +5200,7 @@
return status;
} /* End dot11fUnpackIeWPA. */
-#define SigIeWPA ( 0x007d )
+#define SigIeWPA ( 0x007e )
tANI_U32 dot11fUnpackIeWPAOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWPAOpaque *pDst)
@@ -5206,7 +5220,7 @@
return status;
} /* End dot11fUnpackIeWPAOpaque. */
-#define SigIeWPAOpaque ( 0x007e )
+#define SigIeWPAOpaque ( 0x007f )
static const tTLVDefn TLVS_WSC[ ] = {
@@ -5244,7 +5258,7 @@
return status;
} /* End dot11fUnpackIeWSC. */
-#define SigIeWSC ( 0x007f )
+#define SigIeWSC ( 0x0080 )
tANI_U32 dot11fUnpackIeWiderBWChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWiderBWChanSwitchAnn *pDst)
@@ -5264,7 +5278,7 @@
return status;
} /* End dot11fUnpackIeWiderBWChanSwitchAnn. */
-#define SigIeWiderBWChanSwitchAnn ( 0x0080 )
+#define SigIeWiderBWChanSwitchAnn ( 0x0081 )
static const tTLVDefn TLVS_WscAssocReq[ ] = {
@@ -5283,7 +5297,7 @@
return status;
} /* End dot11fUnpackIeWscAssocReq. */
-#define SigIeWscAssocReq ( 0x0081 )
+#define SigIeWscAssocReq ( 0x0082 )
static const tTLVDefn TLVS_WscAssocRes[ ] = {
@@ -5302,7 +5316,7 @@
return status;
} /* End dot11fUnpackIeWscAssocRes. */
-#define SigIeWscAssocRes ( 0x0082 )
+#define SigIeWscAssocRes ( 0x0083 )
static const tTLVDefn TLVS_WscBeacon[ ] = {
@@ -5327,7 +5341,7 @@
return status;
} /* End dot11fUnpackIeWscBeacon. */
-#define SigIeWscBeacon ( 0x0083 )
+#define SigIeWscBeacon ( 0x0084 )
static const tTLVDefn TLVS_WscBeaconProbeRes[ ] = {
@@ -5360,7 +5374,7 @@
return status;
} /* End dot11fUnpackIeWscBeaconProbeRes. */
-#define SigIeWscBeaconProbeRes ( 0x0084 )
+#define SigIeWscBeaconProbeRes ( 0x0085 )
tANI_U32 dot11fUnpackIeWscIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWscIEOpaque *pDst)
@@ -5380,7 +5394,7 @@
return status;
} /* End dot11fUnpackIeWscIEOpaque. */
-#define SigIeWscIEOpaque ( 0x0085 )
+#define SigIeWscIEOpaque ( 0x0086 )
static const tTLVDefn TLVS_WscProbeReq[ ] = {
@@ -5411,7 +5425,7 @@
return status;
} /* End dot11fUnpackIeWscProbeReq. */
-#define SigIeWscProbeReq ( 0x0086 )
+#define SigIeWscProbeReq ( 0x0087 )
static const tTLVDefn TLVS_WscProbeRes[ ] = {
@@ -5444,7 +5458,7 @@
return status;
} /* End dot11fUnpackIeWscProbeRes. */
-#define SigIeWscProbeRes ( 0x0087 )
+#define SigIeWscProbeRes ( 0x0088 )
static const tTLVDefn TLVS_WscReassocRes[ ] = {
@@ -5463,7 +5477,7 @@
return status;
} /* End dot11fUnpackIeWscReassocRes. */
-#define SigIeWscReassocRes ( 0x0088 )
+#define SigIeWscReassocRes ( 0x0089 )
static const tFFDefn FFS_AddBAReq[] = {
@@ -17815,6 +17829,7 @@
{offsetof(tDot11fTDLSDisRsp, RICData), offsetof(tDot11fIERICData, present), 0, "RICData" , 0, 6, 6, SigIeRICData, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RICDATA, 0, },
{offsetof(tDot11fTDLSDisRsp, HTCaps), offsetof(tDot11fIEHTCaps, present), 0, "HTCaps" , 0, 28, 60, SigIeHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTCAPS, 0, },
{offsetof(tDot11fTDLSDisRsp, LinkIdentifier), offsetof(tDot11fIELinkIdentifier, present), 0, "LinkIdentifier" , 0, 20, 20, SigIeLinkIdentifier, {0, 0, 0, 0, 0}, 0, DOT11F_EID_LINKIDENTIFIER, 1, },
+ {offsetof(tDot11fTDLSDisRsp, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, };
tANI_U32 dot11fUnpackTDLSDisRsp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fTDLSDisRsp *pFrm)
@@ -18094,6 +18109,40 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->LinkIdentifier.InitStaAddr, 6);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->LinkIdentifier.RespStaAddr, 6);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("VHTCaps:\n"));
+ if (!pFrm->VHTCaps.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("maxMPDULen (2): %d\n"), pFrm->VHTCaps.maxMPDULen);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("supportedChannelWidthSet (2): %d\n"), pFrm->VHTCaps.supportedChannelWidthSet);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("ldpcCodingCap (1): %d\n"), pFrm->VHTCaps.ldpcCodingCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("shortGI80MHz (1): %d\n"), pFrm->VHTCaps.shortGI80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("shortGI160and80plus80MHz (1): %d\n"), pFrm->VHTCaps.shortGI160and80plus80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("txSTBC (1): %d\n"), pFrm->VHTCaps.txSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("rxSTBC (3): %d\n"), pFrm->VHTCaps.rxSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("suBeamFormerCap (1): %d\n"), pFrm->VHTCaps.suBeamFormerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("suBeamformeeCap (1): %d\n"), pFrm->VHTCaps.suBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("csnofBeamformerAntSup (3): %d\n"), pFrm->VHTCaps.csnofBeamformerAntSup);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("numSoundingDim (3): %d\n"), pFrm->VHTCaps.numSoundingDim);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("muBeamformerCap (1): %d\n"), pFrm->VHTCaps.muBeamformerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("muBeamformeeCap (1): %d\n"), pFrm->VHTCaps.muBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("vhtTXOPPS (1): %d\n"), pFrm->VHTCaps.vhtTXOPPS);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("htcVHTCap (1): %d\n"), pFrm->VHTCaps.htcVHTCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("maxAMPDULenExp (3): %d\n"), pFrm->VHTCaps.maxAMPDULenExp);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("vhtLinkAdaptCap (2): %d\n"), pFrm->VHTCaps.vhtLinkAdaptCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("rxAntPattern (1): %d\n"), pFrm->VHTCaps.rxAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("txAntPattern (1): %d\n"), pFrm->VHTCaps.txAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved1 (2): %d\n"), pFrm->VHTCaps.reserved1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->VHTCaps.rxMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("rxHighSupDataRate (13): %d\n"), pFrm->VHTCaps.rxHighSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved2 (3): %d\n"), pFrm->VHTCaps.reserved2);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->VHTCaps.txMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("txSupDataRate (13): %d\n"), pFrm->VHTCaps.txSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved3 (3): %d\n"), pFrm->VHTCaps.reserved3);
+ }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -18235,6 +18284,7 @@
{offsetof(tDot11fTDLSSetupCnf, HTInfo), offsetof(tDot11fIEHTInfo, present), 0, "HTInfo" , 0, 24, 56, SigIeHTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTINFO, 0, },
{offsetof(tDot11fTDLSSetupCnf, LinkIdentifier), offsetof(tDot11fIELinkIdentifier, present), 0, "LinkIdentifier" , 0, 20, 20, SigIeLinkIdentifier, {0, 0, 0, 0, 0}, 0, DOT11F_EID_LINKIDENTIFIER, 0, },
{offsetof(tDot11fTDLSSetupCnf, WMMInfoStation), offsetof(tDot11fIEWMMInfoStation, present), 0, "WMMInfoStation" , 0, 9, 9, SigIeWMMInfoStation, {0, 80, 242, 2, 0}, 5, DOT11F_EID_WMMINFOSTATION, 0, },
+ {offsetof(tDot11fTDLSSetupCnf, VHTOperation), offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation" , 0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTOPERATION, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, };
tANI_U32 dot11fUnpackTDLSSetupCnf(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fTDLSSetupCnf *pFrm)
@@ -18425,6 +18475,18 @@
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("max_sp_length (2): %d\n"), pFrm->WMMInfoStation.max_sp_length);
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("reserved2 (1): %d\n"), pFrm->WMMInfoStation.reserved2);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("VHTOperation:\n"));
+ if (!pFrm->VHTOperation.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->VHTOperation.chanWidth, 1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->VHTOperation.chanCenterFreqSeg1, 1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->VHTOperation.chanCenterFreqSeg2, 1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->VHTOperation.basicMCSSet, 2);
+ }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -18453,6 +18515,8 @@
{offsetof(tDot11fTDLSSetupReq, HTCaps), offsetof(tDot11fIEHTCaps, present), 0, "HTCaps" , 0, 28, 60, SigIeHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTCAPS, 0, },
{offsetof(tDot11fTDLSSetupReq, LinkIdentifier), offsetof(tDot11fIELinkIdentifier, present), 0, "LinkIdentifier" , 0, 20, 20, SigIeLinkIdentifier, {0, 0, 0, 0, 0}, 0, DOT11F_EID_LINKIDENTIFIER, 1, },
{offsetof(tDot11fTDLSSetupReq, WMMInfoStation), offsetof(tDot11fIEWMMInfoStation, present), 0, "WMMInfoStation" , 0, 9, 9, SigIeWMMInfoStation, {0, 80, 242, 2, 0}, 5, DOT11F_EID_WMMINFOSTATION, 0, },
+ {offsetof(tDot11fTDLSSetupReq, AID), offsetof(tDot11fIEAID, present), 0, "AID" , 0, 4, 4, SigIeAID, {0, 0, 0, 0, 0}, 0, DOT11F_EID_AID, 0, },
+ {offsetof(tDot11fTDLSSetupReq, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, };
tANI_U32 dot11fUnpackTDLSSetupReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fTDLSSetupReq *pFrm)
@@ -18774,6 +18838,49 @@
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("max_sp_length (2): %d\n"), pFrm->WMMInfoStation.max_sp_length);
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved2 (1): %d\n"), pFrm->WMMInfoStation.reserved2);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("AID:\n"));
+ if (!pFrm->AID.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->AID.assocId, 2);
+ }
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("VHTCaps:\n"));
+ if (!pFrm->VHTCaps.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("maxMPDULen (2): %d\n"), pFrm->VHTCaps.maxMPDULen);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("supportedChannelWidthSet (2): %d\n"), pFrm->VHTCaps.supportedChannelWidthSet);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("ldpcCodingCap (1): %d\n"), pFrm->VHTCaps.ldpcCodingCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("shortGI80MHz (1): %d\n"), pFrm->VHTCaps.shortGI80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("shortGI160and80plus80MHz (1): %d\n"), pFrm->VHTCaps.shortGI160and80plus80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("txSTBC (1): %d\n"), pFrm->VHTCaps.txSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("rxSTBC (3): %d\n"), pFrm->VHTCaps.rxSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("suBeamFormerCap (1): %d\n"), pFrm->VHTCaps.suBeamFormerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("suBeamformeeCap (1): %d\n"), pFrm->VHTCaps.suBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("csnofBeamformerAntSup (3): %d\n"), pFrm->VHTCaps.csnofBeamformerAntSup);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("numSoundingDim (3): %d\n"), pFrm->VHTCaps.numSoundingDim);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("muBeamformerCap (1): %d\n"), pFrm->VHTCaps.muBeamformerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("muBeamformeeCap (1): %d\n"), pFrm->VHTCaps.muBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("vhtTXOPPS (1): %d\n"), pFrm->VHTCaps.vhtTXOPPS);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("htcVHTCap (1): %d\n"), pFrm->VHTCaps.htcVHTCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("maxAMPDULenExp (3): %d\n"), pFrm->VHTCaps.maxAMPDULenExp);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("vhtLinkAdaptCap (2): %d\n"), pFrm->VHTCaps.vhtLinkAdaptCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("rxAntPattern (1): %d\n"), pFrm->VHTCaps.rxAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("txAntPattern (1): %d\n"), pFrm->VHTCaps.txAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved1 (2): %d\n"), pFrm->VHTCaps.reserved1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->VHTCaps.rxMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("rxHighSupDataRate (13): %d\n"), pFrm->VHTCaps.rxHighSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved2 (3): %d\n"), pFrm->VHTCaps.reserved2);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->VHTCaps.txMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("txSupDataRate (13): %d\n"), pFrm->VHTCaps.txSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved3 (3): %d\n"), pFrm->VHTCaps.reserved3);
+ }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -18803,6 +18910,8 @@
{offsetof(tDot11fTDLSSetupRsp, HTCaps), offsetof(tDot11fIEHTCaps, present), 0, "HTCaps" , 0, 28, 60, SigIeHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTCAPS, 0, },
{offsetof(tDot11fTDLSSetupRsp, LinkIdentifier), offsetof(tDot11fIELinkIdentifier, present), 0, "LinkIdentifier" , 0, 20, 20, SigIeLinkIdentifier, {0, 0, 0, 0, 0}, 0, DOT11F_EID_LINKIDENTIFIER, 0, },
{offsetof(tDot11fTDLSSetupRsp, WMMInfoStation), offsetof(tDot11fIEWMMInfoStation, present), 0, "WMMInfoStation" , 0, 9, 9, SigIeWMMInfoStation, {0, 80, 242, 2, 0}, 5, DOT11F_EID_WMMINFOSTATION, 0, },
+ {offsetof(tDot11fTDLSSetupRsp, AID), offsetof(tDot11fIEAID, present), 0, "AID" , 0, 4, 4, SigIeAID, {0, 0, 0, 0, 0}, 0, DOT11F_EID_AID, 0, },
+ {offsetof(tDot11fTDLSSetupRsp, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, };
tANI_U32 dot11fUnpackTDLSSetupRsp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fTDLSSetupRsp *pFrm)
@@ -19126,6 +19235,49 @@
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("max_sp_length (2): %d\n"), pFrm->WMMInfoStation.max_sp_length);
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved2 (1): %d\n"), pFrm->WMMInfoStation.reserved2);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("AID:\n"));
+ if (!pFrm->AID.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->AID.assocId, 2);
+ }
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("VHTCaps:\n"));
+ if (!pFrm->VHTCaps.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("maxMPDULen (2): %d\n"), pFrm->VHTCaps.maxMPDULen);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("supportedChannelWidthSet (2): %d\n"), pFrm->VHTCaps.supportedChannelWidthSet);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("ldpcCodingCap (1): %d\n"), pFrm->VHTCaps.ldpcCodingCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("shortGI80MHz (1): %d\n"), pFrm->VHTCaps.shortGI80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("shortGI160and80plus80MHz (1): %d\n"), pFrm->VHTCaps.shortGI160and80plus80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("txSTBC (1): %d\n"), pFrm->VHTCaps.txSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("rxSTBC (3): %d\n"), pFrm->VHTCaps.rxSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("suBeamFormerCap (1): %d\n"), pFrm->VHTCaps.suBeamFormerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("suBeamformeeCap (1): %d\n"), pFrm->VHTCaps.suBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("csnofBeamformerAntSup (3): %d\n"), pFrm->VHTCaps.csnofBeamformerAntSup);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("numSoundingDim (3): %d\n"), pFrm->VHTCaps.numSoundingDim);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("muBeamformerCap (1): %d\n"), pFrm->VHTCaps.muBeamformerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("muBeamformeeCap (1): %d\n"), pFrm->VHTCaps.muBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("vhtTXOPPS (1): %d\n"), pFrm->VHTCaps.vhtTXOPPS);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("htcVHTCap (1): %d\n"), pFrm->VHTCaps.htcVHTCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("maxAMPDULenExp (3): %d\n"), pFrm->VHTCaps.maxAMPDULenExp);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("vhtLinkAdaptCap (2): %d\n"), pFrm->VHTCaps.vhtLinkAdaptCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("rxAntPattern (1): %d\n"), pFrm->VHTCaps.rxAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("txAntPattern (1): %d\n"), pFrm->VHTCaps.txAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved1 (2): %d\n"), pFrm->VHTCaps.reserved1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->VHTCaps.rxMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("rxHighSupDataRate (13): %d\n"), pFrm->VHTCaps.rxHighSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved2 (3): %d\n"), pFrm->VHTCaps.reserved2);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->VHTCaps.txMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("txSupDataRate (13): %d\n"), pFrm->VHTCaps.txSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved3 (3): %d\n"), pFrm->VHTCaps.reserved3);
+ }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -19938,6 +20090,9 @@
case SigIeWMMTSPEC:
status |= dot11fUnpackIeWMMTSPEC(pCtx, pBufRemaining, len, ( tDot11fIEWMMTSPEC* )(pFrm + pIe->offset + sizeof(tDot11fIEWMMTSPEC)*countOffset) );
break;
+ 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;
@@ -22033,6 +22188,11 @@
byteCount = 56;
pIePresent = ( (tDot11fIEWMMTSPEC* )(pFrm + pIe->offset + offset * i ))->present;
break;
+ case SigIeAID:
+ offset = sizeof(tDot11fIEAID);
+ 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);
@@ -26334,6 +26494,36 @@
return DOT11F_PARSE_SUCCESS;
} /* End dot11fPackIeWMMTSPEC. */
+tANI_U32 dot11fPackIeAID(tpAniSirGlobal pCtx,
+ tDot11fIEAID *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 = 197;
+ ++pBuf; ++(*pnConsumed);
+ pIeLen = pBuf;
+ ++pBuf; ++(*pnConsumed);
+ frameshtons(pCtx, pBuf, pSrc->assocId, 0);
+ *pnConsumed += 2;
+ // fieldsEndFlag = 1
+ break;
+ }
+ (void)pCtx;
+ if (pIeLen)
+ {
+ *pIeLen = *pnConsumed - nConsumedOnEntry - 2;
+ }
+ return DOT11F_PARSE_SUCCESS;
+} /* End dot11fPackIeAID. */
+
tANI_U32 dot11fPackIeAirgo(tpAniSirGlobal pCtx,
tDot11fIEAirgo *pSrc,
tANI_U8 *pBuf,
@@ -42509,6 +42699,40 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->LinkIdentifier.InitStaAddr, 6);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->LinkIdentifier.RespStaAddr, 6);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("VHTCaps:\n"));
+ if (!pFrm->VHTCaps.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("maxMPDULen (2): %d\n"), pFrm->VHTCaps.maxMPDULen);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("supportedChannelWidthSet (2): %d\n"), pFrm->VHTCaps.supportedChannelWidthSet);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("ldpcCodingCap (1): %d\n"), pFrm->VHTCaps.ldpcCodingCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("shortGI80MHz (1): %d\n"), pFrm->VHTCaps.shortGI80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("shortGI160and80plus80MHz (1): %d\n"), pFrm->VHTCaps.shortGI160and80plus80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("txSTBC (1): %d\n"), pFrm->VHTCaps.txSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("rxSTBC (3): %d\n"), pFrm->VHTCaps.rxSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("suBeamFormerCap (1): %d\n"), pFrm->VHTCaps.suBeamFormerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("suBeamformeeCap (1): %d\n"), pFrm->VHTCaps.suBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("csnofBeamformerAntSup (3): %d\n"), pFrm->VHTCaps.csnofBeamformerAntSup);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("numSoundingDim (3): %d\n"), pFrm->VHTCaps.numSoundingDim);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("muBeamformerCap (1): %d\n"), pFrm->VHTCaps.muBeamformerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("muBeamformeeCap (1): %d\n"), pFrm->VHTCaps.muBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("vhtTXOPPS (1): %d\n"), pFrm->VHTCaps.vhtTXOPPS);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("htcVHTCap (1): %d\n"), pFrm->VHTCaps.htcVHTCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("maxAMPDULenExp (3): %d\n"), pFrm->VHTCaps.maxAMPDULenExp);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("vhtLinkAdaptCap (2): %d\n"), pFrm->VHTCaps.vhtLinkAdaptCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("rxAntPattern (1): %d\n"), pFrm->VHTCaps.rxAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("txAntPattern (1): %d\n"), pFrm->VHTCaps.txAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved1 (2): %d\n"), pFrm->VHTCaps.reserved1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->VHTCaps.rxMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("rxHighSupDataRate (13): %d\n"), pFrm->VHTCaps.rxHighSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved2 (3): %d\n"), pFrm->VHTCaps.reserved2);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->VHTCaps.txMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("txSupDataRate (13): %d\n"), pFrm->VHTCaps.txSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved3 (3): %d\n"), pFrm->VHTCaps.reserved3);
+ }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), pBuf, nBuf);
}
@@ -42801,6 +43025,18 @@
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("max_sp_length (2): %d\n"), pFrm->WMMInfoStation.max_sp_length);
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("reserved2 (1): %d\n"), pFrm->WMMInfoStation.reserved2);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("VHTOperation:\n"));
+ if (!pFrm->VHTOperation.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->VHTOperation.chanWidth, 1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->VHTOperation.chanCenterFreqSeg1, 1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->VHTOperation.chanCenterFreqSeg2, 1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->VHTOperation.basicMCSSet, 2);
+ }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), pBuf, nBuf);
}
@@ -43127,6 +43363,49 @@
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("max_sp_length (2): %d\n"), pFrm->WMMInfoStation.max_sp_length);
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved2 (1): %d\n"), pFrm->WMMInfoStation.reserved2);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("AID:\n"));
+ if (!pFrm->AID.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->AID.assocId, 2);
+ }
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("VHTCaps:\n"));
+ if (!pFrm->VHTCaps.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("maxMPDULen (2): %d\n"), pFrm->VHTCaps.maxMPDULen);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("supportedChannelWidthSet (2): %d\n"), pFrm->VHTCaps.supportedChannelWidthSet);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("ldpcCodingCap (1): %d\n"), pFrm->VHTCaps.ldpcCodingCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("shortGI80MHz (1): %d\n"), pFrm->VHTCaps.shortGI80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("shortGI160and80plus80MHz (1): %d\n"), pFrm->VHTCaps.shortGI160and80plus80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("txSTBC (1): %d\n"), pFrm->VHTCaps.txSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("rxSTBC (3): %d\n"), pFrm->VHTCaps.rxSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("suBeamFormerCap (1): %d\n"), pFrm->VHTCaps.suBeamFormerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("suBeamformeeCap (1): %d\n"), pFrm->VHTCaps.suBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("csnofBeamformerAntSup (3): %d\n"), pFrm->VHTCaps.csnofBeamformerAntSup);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("numSoundingDim (3): %d\n"), pFrm->VHTCaps.numSoundingDim);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("muBeamformerCap (1): %d\n"), pFrm->VHTCaps.muBeamformerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("muBeamformeeCap (1): %d\n"), pFrm->VHTCaps.muBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("vhtTXOPPS (1): %d\n"), pFrm->VHTCaps.vhtTXOPPS);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("htcVHTCap (1): %d\n"), pFrm->VHTCaps.htcVHTCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("maxAMPDULenExp (3): %d\n"), pFrm->VHTCaps.maxAMPDULenExp);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("vhtLinkAdaptCap (2): %d\n"), pFrm->VHTCaps.vhtLinkAdaptCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("rxAntPattern (1): %d\n"), pFrm->VHTCaps.rxAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("txAntPattern (1): %d\n"), pFrm->VHTCaps.txAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved1 (2): %d\n"), pFrm->VHTCaps.reserved1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->VHTCaps.rxMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("rxHighSupDataRate (13): %d\n"), pFrm->VHTCaps.rxHighSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved2 (3): %d\n"), pFrm->VHTCaps.reserved2);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->VHTCaps.txMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("txSupDataRate (13): %d\n"), pFrm->VHTCaps.txSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved3 (3): %d\n"), pFrm->VHTCaps.reserved3);
+ }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), pBuf, nBuf);
}
@@ -43455,6 +43734,49 @@
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("max_sp_length (2): %d\n"), pFrm->WMMInfoStation.max_sp_length);
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved2 (1): %d\n"), pFrm->WMMInfoStation.reserved2);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("AID:\n"));
+ if (!pFrm->AID.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->AID.assocId, 2);
+ }
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("VHTCaps:\n"));
+ if (!pFrm->VHTCaps.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("maxMPDULen (2): %d\n"), pFrm->VHTCaps.maxMPDULen);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("supportedChannelWidthSet (2): %d\n"), pFrm->VHTCaps.supportedChannelWidthSet);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("ldpcCodingCap (1): %d\n"), pFrm->VHTCaps.ldpcCodingCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("shortGI80MHz (1): %d\n"), pFrm->VHTCaps.shortGI80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("shortGI160and80plus80MHz (1): %d\n"), pFrm->VHTCaps.shortGI160and80plus80MHz);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("txSTBC (1): %d\n"), pFrm->VHTCaps.txSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("rxSTBC (3): %d\n"), pFrm->VHTCaps.rxSTBC);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("suBeamFormerCap (1): %d\n"), pFrm->VHTCaps.suBeamFormerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("suBeamformeeCap (1): %d\n"), pFrm->VHTCaps.suBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("csnofBeamformerAntSup (3): %d\n"), pFrm->VHTCaps.csnofBeamformerAntSup);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("numSoundingDim (3): %d\n"), pFrm->VHTCaps.numSoundingDim);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("muBeamformerCap (1): %d\n"), pFrm->VHTCaps.muBeamformerCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("muBeamformeeCap (1): %d\n"), pFrm->VHTCaps.muBeamformeeCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("vhtTXOPPS (1): %d\n"), pFrm->VHTCaps.vhtTXOPPS);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("htcVHTCap (1): %d\n"), pFrm->VHTCaps.htcVHTCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("maxAMPDULenExp (3): %d\n"), pFrm->VHTCaps.maxAMPDULenExp);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("vhtLinkAdaptCap (2): %d\n"), pFrm->VHTCaps.vhtLinkAdaptCap);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("rxAntPattern (1): %d\n"), pFrm->VHTCaps.rxAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("txAntPattern (1): %d\n"), pFrm->VHTCaps.txAntPattern);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved1 (2): %d\n"), pFrm->VHTCaps.reserved1);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->VHTCaps.rxMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("rxHighSupDataRate (13): %d\n"), pFrm->VHTCaps.rxHighSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved2 (3): %d\n"), pFrm->VHTCaps.reserved2);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->VHTCaps.txMCSMap, 2);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("txSupDataRate (13): %d\n"), pFrm->VHTCaps.txSupDataRate);
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved3 (3): %d\n"), pFrm->VHTCaps.reserved3);
+ }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), pBuf, nBuf);
}
@@ -44127,6 +44449,9 @@
case SigIeWMMTSPEC:
status |= dot11fPackIeWMMTSPEC(pCtx, ( tDot11fIEWMMTSPEC* )(pSrc + pIe->offset + sizeof(tDot11fIEWMMTSPEC) * i ), pBufRemaining, nBufRemaining, &len);
break;
+ 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;