Merge LA.UM.9.12.R2.10.00.00.685.014 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Bug: 158429902
Signed-off-by: lucaswei <lucaswei@google.com>
Change-Id: I055cafe491df95918248801595c73e3de3cb37ad
diff --git a/drivers/rmnet/perf/rmnet_perf_core.c b/drivers/rmnet/perf/rmnet_perf_core.c
index 4e8d4c6..508b30b 100644
--- a/drivers/rmnet/perf/rmnet_perf_core.c
+++ b/drivers/rmnet/perf/rmnet_perf_core.c
@@ -30,7 +30,7 @@
#include "rmnet_perf_core.h"
#include "rmnet_perf_config.h"
-#ifdef CONFIG_QCOM_QMI_POWER_COLLAPSE
+#if IS_ENABLED(CONFIG_QCOM_QMI_POWER_COLLAPSE)
#include <soc/qcom/qmi_rmnet.h>
#endif
@@ -971,7 +971,7 @@
goto skip_frame;
skb->dev = ep->egress_dev;
-#ifdef CONFIG_QCOM_QMI_POWER_COLLAPSE
+#if IS_ENABLED(CONFIG_QCOM_QMI_POWER_COLLAPSE)
/* Wakeup PS work on DL packets */
if ((port->data_format & RMNET_INGRESS_FORMAT_PS) &&
!maph->cd_bit)
