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-23 04:59:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 0de83ae841 on remote branch

Browse source 
Change-Id: Iac6d44e792705408702bcdd9c7a84d8584c36db6
This commit is contained in:
Linux Build Service Account 2022-11-14 03:58:47 -08:00
commit e5396be32e
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/hdd/src/wlan_hdd_debugfs_llstat.c
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -115,11 +116,17 @@ void hdd_debugfs_process_iface_stats(struct hdd_adapter *adapter,
ll_stats.len += len;
len = scnprintf(buffer,
DEBUGFS_LLSTATS_BUF_SIZE - ll_stats.len,
"\nac_type: %d, tx_mpdu: %u, rx_mpdu: %u, tx_mcast: %u, rx_mcast: %u, rx_ampdu: %u tx_ampdu: %u, mpdu_lost: %u, retries: %u, retries_short: %u, retries_long: %u, contention_time: min-%u max-%u avg-%u, contention num samples: %u, tx_pending_msdu: %u",
"\nac_type: %d, tx_mpdu: %u, rx_mpdu: %u, "
"tx_mcast: %u, rx_mcast: %u, tx_ampdu: %u, "
"rx_ampdu: %u, mpdu_lost: %u, retries: %u, "
"retries_short: %u, retries_long: %u, "
"contention_time: min-%u max-%u avg-%u, "
"contention num samples: %u, "
"tx_pending_msdu: %u",
ac_stats->ac_type,
ac_stats->tx_mpdu, ac_stats->rx_mpdu,
ac_stats->tx_mcast, ac_stats->rx_mcast,
ac_stats->rx_ampdu, ac_stats->rx_ampdu,
ac_stats->tx_ampdu, ac_stats->rx_ampdu,
ac_stats->mpdu_lost, ac_stats->retries,
ac_stats->retries_short, ac_stats->retries_long,
ac_stats->contention_time_min,

5
core/hdd/src/wlan_hdd_power.c
View file

@ -2351,7 +2351,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
if (ucfg_ipa_suspend(hdd_ctx->pdev)) {
hdd_err("IPA not ready to suspend!");
wlan_hdd_inc_suspend_stats(hdd_ctx, SUSPEND_FAIL_IPA);
return -EAGAIN;
goto resume_all_components;
}
/* Suspend control path scheduler */
@ -2436,6 +2436,9 @@ resume_ol_rx:
hdd_ctx->is_scheduler_suspended = false;
resume_tx:
hdd_resume_wlan();
resume_all_components:
ucfg_pmo_resume_all_components(hdd_ctx->psoc, QDF_SYSTEM_SUSPEND);
return -ETIME;
}

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

@ -32,9 +32,9 @@
#define QWLAN_VERSION_MAJOR 2
#define QWLAN_VERSION_MINOR 0
#define QWLAN_VERSION_PATCH 8
#define QWLAN_VERSION_EXTRA "H"
#define QWLAN_VERSION_EXTRA "J"
#define QWLAN_VERSION_BUILD 31
#define QWLAN_VERSIONSTR "2.0.8.31H"
#define QWLAN_VERSIONSTR "2.0.8.31J"
#endif /* QWLAN_VERSION_H */