diff options
| author | Victor Hsu <hsuvictor@google.com> | 2021-11-10 20:57:10 +0800 |
|---|---|---|
| committer | Victor Hsu <hsuvictor@google.com> | 2021-12-13 13:37:29 +0800 |
| commit | 5cfb486d3f2b5f46683495ae82c1060da8118be4 (patch) | |
| tree | 171b6f08e1a88ab4d60fae4b03f9c1e9128fae10 /qmi | |
| parent | c972edc5cac0526943caaa390ddd0faf2ecb18db (diff) | |
| download | cnss2-5cfb486d3f2b5f46683495ae82c1060da8118be4.tar.gz | |
wcn6740: Change the include path to out-of-kernel tree
Change the include path to make sure to include
the correct header files in out-of-kernel tree.
Bug: 203725513
Signed-off-by: Victor Hsu <hsuvictor@google.com>
Change-Id: Iaff00aca3b1e3faa77ffb54bf7eb59b6ca296c58
Diffstat (limited to 'qmi')
| -rw-r--r-- | qmi/Makefile | 2 | ||||
| -rw-r--r-- | qmi/qmi_encdec.c | 4 | ||||
| -rw-r--r-- | qmi/qmi_interface.c | 8 |
3 files changed, 13 insertions, 1 deletions
diff --git a/qmi/Makefile b/qmi/Makefile index 0007965..70c9928 100644 --- a/qmi/Makefile +++ b/qmi/Makefile @@ -1,3 +1,3 @@ -ccflags-y += -I$(WLAN_PLATFORM_ROOT)/inc +#ccflags-y += -I$(WLAN_PLATFORM_ROOT)/inc obj-$(CONFIG_QCOM_QMI_HELPERS) += qmi_helpers.o qmi_helpers-y += qmi_encdec.o qmi_interface.o diff --git a/qmi/qmi_encdec.c b/qmi/qmi_encdec.c index 3aaab71..1d9f3f5 100644 --- a/qmi/qmi_encdec.c +++ b/qmi/qmi_encdec.c @@ -9,7 +9,11 @@ #include <linux/kernel.h> #include <linux/errno.h> #include <linux/string.h> +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "qmi/qmi.h" +#else #include <linux/soc/qcom/qmi.h> +#endif #define QMI_ENCDEC_ENCODE_TLV(type, length, p_dst) do { \ *p_dst++ = type; \ diff --git a/qmi/qmi_interface.c b/qmi/qmi_interface.c index 1a03eaa..5a6c07b 100644 --- a/qmi/qmi_interface.c +++ b/qmi/qmi_interface.c @@ -5,14 +5,22 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/device.h> +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "uapi/qrtr.h" +#else #include <linux/qrtr.h> +#endif #include <linux/net.h> #include <linux/completion.h> #include <linux/idr.h> #include <linux/string.h> #include <net/sock.h> #include <linux/workqueue.h> +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "qmi/qmi.h" +#else #include <linux/soc/qcom/qmi.h> +#endif static struct socket *qmi_sock_create(struct qmi_handle *qmi, struct sockaddr_qrtr *sq); |