diff options
| author | Kondabattini, Ganesh <ganeshk@codeaurora.org> | 2016-09-02 14:43:59 +0530 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-09-10 19:06:29 -0700 |
| commit | b72e25cb7f6c9f811279ea434ca0e390fbaba364 (patch) | |
| tree | cd08a34dc486973562cb6cf1005425283121dc48 | |
| parent | 13bb4b1db81f5d7d7c571df0b2784dc838363659 (diff) | |
qcacld-3.0: Define data structures for new AP requirements
qcacld-2.0 to qcacld-3.0 propagation
Defining data structures for below new requirements.
- beacon_tx_rate
- vendor_ie
- vendor_ie_len
- vendor_ie_assoc_policy
- sta_inactivity_timeout
- tx_pkt_fail_cnt_threshold
- short_retry_limit
- long_retry_limit
- ampdu_size
- supp_rate_set
- extended_rate_set
Change-Id: I9d05cd7b8e051c4e9e4912cf866206ae32ec293d
CRs-Fixed: 1020078
(cherry picked from commit 8f57eee853baff54397c68c8cd71aeb50610a56a)
| -rw-r--r-- | core/mac/inc/sir_api.h | 1 | ||||
| -rw-r--r-- | core/mac/src/pe/include/lim_session.h | 3 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_types.h | 1 | ||||
| -rw-r--r-- | core/sap/inc/sap_api.h | 24 | ||||
| -rw-r--r-- | core/sap/src/sap_internal.h | 3 | ||||
| -rw-r--r-- | core/sme/inc/csr_api.h | 3 | ||||
| -rw-r--r-- | core/sme/inc/csr_internal.h | 1 | ||||
| -rw-r--r-- | core/wma/inc/wma.h | 1 | ||||
| -rw-r--r-- | core/wma/inc/wma_if.h | 1 |
9 files changed, 38 insertions, 0 deletions
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 3f281c74aa03..35b011cb38b5 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -687,6 +687,7 @@ typedef struct sSirSmeStartBssReq { bool obssEnabled; uint8_t sap_dot11mc; + uint8_t beacon_tx_rate; } tSirSmeStartBssReq, *tpSirSmeStartBssReq; diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index 35e8124a9023..0837891de417 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -480,6 +480,9 @@ typedef struct sPESession /* Added to Support BT-AMP */ tDot11fIEVHTCaps vht_caps; tDot11fIEHTInfo ht_operation; tDot11fIEVHTOperation vht_operation; + uint8_t beacon_tx_rate; + uint8_t *vendor_ie; + uint8_t access_policy; } tPESession, *tpPESession; /*------------------------------------------------------------------------- diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index 76f175e0ac61..41b5ab2b9cf1 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -197,6 +197,7 @@ typedef struct sLimMlmStartReq { uint8_t ssidHidden; uint8_t wps_state; uint8_t obssProtEnabled; + uint8_t beacon_tx_rate; } tLimMlmStartReq, *tpLimMlmStartReq; typedef struct sLimMlmStartCnf { diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index edc1bfd8e40e..2032fbe92676 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -496,6 +496,20 @@ struct sap_acs_cfg { uint8_t vht_seg1_center_ch; }; +/* + * enum vendor_ie_access_policy- access policy + * @ACCESS_POLICY_NONE: access policy attribute is not valid + * @ACCESS_POLICY_RESPOND_IF_IE_IS_PRESENT: respond to probe req/assoc req + * only if ie is present + * @ACCESS_POLICY_DONOT_RESPOND_IF_IE_IS_PRESENT: do not respond to probe req/ + * assoc req if ie is present +*/ +enum vendor_ie_access_policy { + ACCESS_POLICY_NONE, + ACCESS_POLICY_RESPOND_IF_IE_IS_PRESENT, + ACCESS_POLICY_DONOT_RESPOND_IF_IE_IS_PRESENT, +}; + typedef struct sap_Config { tSap_SSIDInfo_t SSIDinfo; eCsrPhyMode SapHw_mode; /* Wireless Mode */ @@ -555,6 +569,16 @@ typedef struct sap_Config { /* buffer for addn ies comes from hostapd */ void *pProbeRespBcnIEsBuffer; uint8_t sap_dot11mc; /* Specify if 11MC is enabled or disabled*/ + uint8_t beacon_tx_rate; + uint8_t *vendor_ie; + enum vendor_ie_access_policy vendor_ie_access_policy; + uint16_t sta_inactivity_timeout; + uint16_t tx_pkt_fail_cnt_threshold; + uint8_t short_retry_limit; + uint8_t long_retry_limit; + uint8_t ampdu_size; + tSirMacRateSet supp_rate_set; + tSirMacRateSet extended_rate_set; } tsap_Config_t; #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index d503de6610ea..e8e50f6350ed 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -267,6 +267,9 @@ typedef struct sSapContext { bool is_pre_cac_on; bool pre_cac_complete; uint8_t chan_before_pre_cac; + uint8_t beacon_tx_rate; + tSirMacRateSet supp_rate_set; + tSirMacRateSet extended_rate_set; } *ptSapContext; /*---------------------------------------------------------------------------- diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 9c0e6d0fc329..b8d3c546283b 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -965,6 +965,9 @@ typedef struct tagCsrRoamProfile { /* addIe params */ tSirAddIeParams addIeParams; uint8_t sap_dot11mc; + uint8_t beacon_tx_rate; + tSirMacRateSet supp_rate_set; + tSirMacRateSet extended_rate_set; } tCsrRoamProfile; #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index d9c9fa16b3cf..57df53f2c282 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -359,6 +359,7 @@ typedef struct tagCsrRoamStartBssParams { #endif tSirAddIeParams addIeParams; uint8_t sap_dot11mc; + uint8_t beacon_tx_rate; } tCsrRoamStartBssParams; typedef struct tagScanCmd { diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 238b77083806..f8d796401fea 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1633,6 +1633,7 @@ struct wma_vdev_start_req { bool is_quarter_rate; uint32_t preferred_tx_streams; uint32_t preferred_rx_streams; + uint8_t beacon_tx_rate; }; /** diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index c2007c5ac772..a2d4d370658a 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -513,6 +513,7 @@ typedef struct { uint8_t nss; uint8_t nss_2g; uint8_t nss_5g; + uint8_t beacon_tx_rate; } tAddBssParams, *tpAddBssParams; /** |
