A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 00:00:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "Release 5.2.0.16O"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-22 04:10:44 -07:00 • committed by Gerrit - the friendly Code Review server
commit f70db24c5c
5 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/hdd/src/wlan_hdd_assoc.c
View file

@ -4727,8 +4727,10 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG,
pAdapter->sessionId, roamStatus));
/* Omitting eCSR_ROAM_UPDATE_SCAN_RESULT as this is too frequent */
if (eCSR_ROAM_UPDATE_SCAN_RESULT != roamStatus)
MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG,
pAdapter->sessionId, roamStatus));
switch (roamStatus) {
case eCSR_ROAM_SESSION_OPENED:

4
core/mac/inc/qwlan_version.h
View file

@ -41,9 +41,9 @@
#define QWLAN_VERSION_MAJOR 5
#define QWLAN_VERSION_MINOR 2
#define QWLAN_VERSION_PATCH 0
#define QWLAN_VERSION_EXTRA "N"
#define QWLAN_VERSION_EXTRA "O"
#define QWLAN_VERSION_BUILD 16
#define QWLAN_VERSIONSTR "5.2.0.16N"
#define QWLAN_VERSIONSTR "5.2.0.16O"
#endif /* QWLAN_VERSION_H */

8
core/mac/src/pe/lim/lim_process_message_queue.c
View file

@ -1312,8 +1312,9 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx,
* SME enums (eWNI_SME_START_REQ) starts with 0x16xx.
* Compare received SME events with SIR_SME_MODULE_ID
*/
if (SIR_SME_MODULE_ID ==
(uint8_t)MAC_TRACE_GET_MODULE_ID(msg->type)) {
if ((SIR_SME_MODULE_ID ==
(uint8_t)MAC_TRACE_GET_MODULE_ID(msg->type)) &&
(msg->type != eWNI_SME_REGISTER_MGMT_FRAME_REQ)) {
MTRACE(mac_trace(mac_ctx, TRACE_CODE_RX_SME_MSG,
NO_SESSION, msg->type));
} else {
@ -1323,7 +1324,8 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx,
* if these are also logged
*/
if (msg->type != SIR_CFG_PARAM_UPDATE_IND &&
msg->type != SIR_BB_XPORT_MGMT_MSG)
msg->type != SIR_BB_XPORT_MGMT_MSG &&
msg->type != WMA_RX_SCAN_EVENT)
MTRACE(mac_trace_msg_rx(mac_ctx, NO_SESSION,
LIM_TRACE_MAKE_RXMSG(msg->type,
LIM_MSG_PROCESSED));)

2
core/sme/src/common/sme_api.c
View file

@ -6209,8 +6209,6 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
QDF_STATUS status = QDF_STATUS_SUCCESS;
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
MTRACE(qdf_trace(QDF_MODULE_ID_SME,
TRACE_CODE_SME_RX_HDD_REGISTER_MGMTFR, sessionId, 0));
status = sme_acquire_global_lock(&pMac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
tSirRegisterMgmtFrame *pMsg;

1
core/wma/inc/wma_types.h
View file

@ -237,7 +237,6 @@
#define WMA_SET_MAX_TX_POWER_REQ SIR_HAL_SET_MAX_TX_POWER_REQ
#define WMA_SET_MAX_TX_POWER_RSP SIR_HAL_SET_MAX_TX_POWER_RSP
#define WMA_SET_TX_POWER_REQ SIR_HAL_SET_TX_POWER_REQ
#define WMA_SET_DTIM_PERIOD SIR_HAL_SET_DTIM_PERIOD
#define WMA_SET_MAX_TX_POWER_PER_BAND_REQ \