diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-13 09:44:14 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-13 09:44:14 -0800 |
| commit | e85a05376e3c09a8f958295f07acce09e78715eb (patch) | |
| tree | 0585400ed9b150d1dc88eebbbdbbf053d92df1b3 | |
| parent | c62b5b553b3d97d52cf9d978932fa2cccb1e470f (diff) | |
| parent | 3feba15477ff8e92f5b75135ff57bff344ddc04b (diff) | |
Merge "qcacld-2.0: Fix SAP omit send action frame issue" into wlan-cld2.driver.lnx.1.0-dev
| -rw-r--r-- | CORE/MAC/src/include/dphGlobal.h | 6 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c | 3 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limUtils.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/CORE/MAC/src/include/dphGlobal.h b/CORE/MAC/src/include/dphGlobal.h index 9fff3d86fbe2..056140debf81 100644 --- a/CORE/MAC/src/include/dphGlobal.h +++ b/CORE/MAC/src/include/dphGlobal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -513,11 +513,13 @@ typedef struct sDphHashNode tANI_U8 isDisassocDeauthInProgress; bool sta_deletion_in_progress; - struct sDphHashNode *next; tANI_S8 del_sta_ctx_rssi; uint8_t sub20_dynamic_channelwidth; /* Flag indicating connected STA doesn't support ECSA */ uint8_t non_ecsa_capable; + /* DO NOT ADD NEW MEMBER AFTER MEMBER *next */ + struct sDphHashNode *next; + /* DO NOT ADD NEW MEMBER AFTER MEMBER *next */ } tDphHashNode, *tpDphHashNode; diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c index 5bd3baf325bb..553ff7464533 100644 --- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c @@ -7359,7 +7359,8 @@ static void send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, switch_count = session_entry->gLimChannelSwitch.switchCount; if (LIM_IS_AP_ROLE(session_entry)) { - for (i = 0; i < mac_ctx->lim.maxStation; i++) { + /* first node in hash table not used */ + for (i = 0; i < (mac_ctx->lim.maxStation + 1); i++) { psta = session_entry->dph.dphHashTable.pDphNodeArray + i; if (psta && psta->added) { diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c index eb86ae35821b..ac2caf1bc8d5 100644 --- a/CORE/MAC/src/pe/lim/limUtils.c +++ b/CORE/MAC/src/pe/lim/limUtils.c @@ -5177,7 +5177,7 @@ limDeleteBASessions(tpAniSirGlobal pMac, tpPESession pSessionEntry, LIM_IS_BT_AMP_AP_ROLE(pSessionEntry) || LIM_IS_IBSS_ROLE(pSessionEntry) || LIM_IS_P2P_DEVICE_GO(pSessionEntry)) { - for (i = 0; i < pMac->lim.maxStation; i++) + for (i = 0; i < (pMac->lim.maxStation + 1); i++) { pSta = pSessionEntry->dph.dphHashTable.pDphNodeArray + i; if (pSta && pSta->added) |