summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryeshwanth sriram guntuka <ysriramg@codeaurora.org>2017-03-07 12:43:02 +0530
committerSandeep Puligilla <spuligil@codeaurora.org>2017-03-15 04:53:26 -0700
commitfecbef58c284cf51070708ea00ae971619f4837f (patch)
tree1cdc91866cc16643c610ae7013d65da9be4a8e02
parentdc15e603f9c265f51b1fe5f69566839a5298199c (diff)
qcacld-3.0: Add HT/VHT check when getting network type
11n or 11ac AP does not include 11g rates due to which driver treats the AP as 11b AP. Fix is to add HT/VHT check so that driver treats AP based on capabilities. Change-Id: I1bb49408e4e480578e2f190c5f7c0408f734d82e CRs-Fixed: 2015843
-rw-r--r--core/mac/src/pe/lim/lim_assoc_utils.c14
-rw-r--r--core/mac/src/pe/lim/lim_utils.c3
2 files changed, 4 insertions, 13 deletions
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 0ee15796073d..8ba7c60c1575 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -2129,7 +2129,6 @@ lim_add_sta(tpAniSirGlobal mac_ctx,
tSirMsgQ msg_q;
tSirRetStatus ret_code = eSIR_SUCCESS;
tSirMacAddr sta_mac, *sta_Addr;
- uint8_t i, nw_type_11b = 0;
tpSirAssocReq assoc_req;
tLimIbssPeerNode *peer_node; /* for IBSS mode */
uint8_t *p2p_ie = NULL;
@@ -2481,18 +2480,7 @@ lim_add_sta(tpAniSirGlobal mac_ctx,
if (add_sta_params->respReqd)
SET_LIM_PROCESS_DEFD_MESGS(mac_ctx, false);
- for (i = 0; i < SIR_NUM_11A_RATES; i++) {
- if (sirIsArate(sta_ds->supportedRates.llaRates[i] & 0x7F)) {
- nw_type_11b = 0;
- break;
- } else {
- nw_type_11b = 1;
- }
- }
- if (nw_type_11b)
- add_sta_params->nwType = eSIR_11B_NW_TYPE;
- else
- add_sta_params->nwType = session_entry->nwType;
+ add_sta_params->nwType = session_entry->nwType;
msg_q.type = WMA_ADD_STA_REQ;
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index b180ae97b8f1..ae9d7af0dbfb 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -5400,6 +5400,9 @@ tSirNwType lim_get_nw_type(tpAniSirGlobal pMac, uint8_t channelNum, uint32_t typ
if (pBeacon->extendedRatesPresent) {
lim_log(pMac, LOGD, FL("Beacon, nwtype=G"));
nwType = eSIR_11G_NW_TYPE;
+ } else if (pBeacon->HTInfo.present ||
+ IS_BSS_VHT_CAPABLE(pBeacon->VHTCaps)) {
+ nwType = eSIR_11G_NW_TYPE;
}
} else {
/* 11a packet */