From 45243809b9e3cf7d8a78df5e72b962d68b3ae044 Mon Sep 17 00:00:00 2001 From: Saket Jha Date: Thu, 16 Jan 2020 13:35:02 -0800 Subject: [PATCH] qcacld-3.0: Correct featurization of PM QoS support for 5.4 Kernel Currently PM QoS is only enabled for kernel version 4.19.0 and below but is supported and needed in kernel version 4.19.72. So enable PM QoS if kernel version is below 5.4.0. Change-Id: I440abe1cf9737447faff250b1973f1e6e2fe378e CRs-Fixed: 2603396 --- core/hdd/inc/wlan_hdd_main.h | 4 ++-- core/hdd/src/wlan_hdd_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 1adff42a03be..3a737ec779fc 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -110,7 +110,7 @@ #endif #if defined(CLD_PM_QOS) && \ - (LINUX_VERSION_CODE <= KERNEL_VERSION(4, 19, 0)) + (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) #include #endif @@ -1887,7 +1887,7 @@ struct hdd_context { qdf_time_t runtime_resume_start_time_stamp; qdf_time_t runtime_suspend_done_time_stamp; #if defined(CLD_PM_QOS) && \ - (LINUX_VERSION_CODE <= KERNEL_VERSION(4, 19, 0)) + (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) struct pm_qos_request pm_qos_req; #endif #ifdef WLAN_FEATURE_PKT_CAPTURE diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 6b52290536fa..28e93f8b3846 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -8378,7 +8378,7 @@ static void hdd_clear_rps_cpu_mask(struct hdd_context *hdd_ctx) } #if defined(CLD_PM_QOS) && \ - (LINUX_VERSION_CODE <= KERNEL_VERSION(4, 19, 0)) + (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) #define PLD_REMOVE_PM_QOS(x) #define PLD_REQUEST_PM_QOS(x, y) /**