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
diff --git a/CORE/CLD_TXRX/TLSHIM/tl_shim.c b/CORE/CLD_TXRX/TLSHIM/tl_shim.c index 04ff361..6388f3a 100644 --- a/CORE/CLD_TXRX/TLSHIM/tl_shim.c +++ b/CORE/CLD_TXRX/TLSHIM/tl_shim.c
@@ -646,6 +646,7 @@ * 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 d31c16d..0e0f619 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -20589,7 +20589,7 @@ if (!found) { opClasses[i]= class; i++; - if (i == SIR_MAC_MAX_SUPP_OPER_CLASSES) + if (i >= SIR_MAC_MAX_SUPP_OPER_CLASSES) break; } }