diff options
| -rw-r--r-- | core/mac/src/pe/lim/lim_assoc_utils.c | 14 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_utils.c | 3 |
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 */ |