diff options
| author | Will Huang <wilhuang@codeaurora.org> | 2017-12-01 11:35:28 +0800 |
|---|---|---|
| committer | snandini <snandini@codeaurora.org> | 2017-12-08 00:20:09 -0800 |
| commit | af2bc8729e9fec4206e2881309a89eee83edf820 (patch) | |
| tree | ac365a8ef0ca714e1182718de114f3f39ab1fd8f | |
| parent | 500eed0b94dd50f0496db9e3f4aad5778471f910 (diff) | |
qcacld-2.0: Pair spin lock with unlock
In some failure path of tlshim_mgmt_rx_process function,
locked spin lock must unlock before exit.
Optimize opClasses check in csrInitOperatingClasses.
Change-Id: I9fc195fac16e3b8ec03e0c87a48658d7748d1c31
CRs-Fixed: 2155647
| -rw-r--r-- | CORE/CLD_TXRX/TLSHIM/tl_shim.c | 1 | ||||
| -rw-r--r-- | CORE/SME/src/csr/csrApiRoam.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CORE/CLD_TXRX/TLSHIM/tl_shim.c b/CORE/CLD_TXRX/TLSHIM/tl_shim.c index 04ff361818b5..6388f3a8e223 100644 --- a/CORE/CLD_TXRX/TLSHIM/tl_shim.c +++ b/CORE/CLD_TXRX/TLSHIM/tl_shim.c @@ -646,6 +646,7 @@ static int tlshim_mgmt_rx_process(void *context, u_int8_t *data, * If the mpdu_data_len is greater than Max (2k), drop the frame */ if (rx_pkt->pkt_meta.mpdu_data_len > WMA_MAX_MGMT_MPDU_LEN) { + adf_os_spin_unlock_bh(&tl_shim->mgmt_lock); TLSHIM_LOGE("Data Len %d greater than max, dropping frame", rx_pkt->pkt_meta.mpdu_data_len); vos_mem_free(rx_pkt); diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index d31c16d9bc63..0e0f619e6875 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -20589,7 +20589,7 @@ void csrInitOperatingClasses(tHalHandle hHal) if (!found) { opClasses[i]= class; i++; - if (i == SIR_MAC_MAX_SUPP_OPER_CLASSES) + if (i >= SIR_MAC_MAX_SUPP_OPER_CLASSES) break; } } |