From 0bec9a925953c0d92cb530c808dd67de56a0923e Mon Sep 17 00:00:00 2001
From: Dustin Brown <dustinb@codeaurora.org>
Date: Thu, 17 Aug 2017 15:44:34 -0700
Subject: [PATCH] qcacld-3.0: Prepend kernel includes with "kernel/"

To avoid include conflicts, prepend all kernel includes with "kernel/"

Change-Id: I8a3f037c4abf07b129875b919225825701dc1046
CRs-Fixed: 2094774
---
 Kbuild                          | 2 +-
 core/dp/txrx/ol_rx_defrag.c     | 2 +-
 core/dp/txrx/ol_rx_reorder.c    | 2 +-
 core/dp/txrx/ol_tx_send.c       | 2 +-
 core/dp/txrx/ol_txrx_encap.c    | 2 +-
 core/dp/txrx/ol_txrx_internal.h | 2 +-
 core/hdd/inc/wlan_hdd_ftm.h     | 1 -
 core/hdd/src/wlan_hdd_ioctl.h   | 2 +-
 core/hdd/src/wlan_hdd_ipa.c     | 2 +-
 core/hdd/src/wlan_hdd_napi.c    | 2 +-
 uapi/linux/osapi_linux.h        | 6 +++---
 11 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Kbuild b/Kbuild
index 3493bfd3cc..c291ec52fb 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1431,7 +1431,7 @@ endif
 TARGET_INC :=	-I$(WLAN_ROOT)/../fw-api/hw/qca6290/v2 \
 		-I$(WLAN_ROOT)/../fw-api/fw
 
-LINUX_INC :=	-Iinclude/linux
+LINUX_INC :=	-Iinclude
 
 INCS :=		$(HDD_INC) \
 		$(EPPING_INC) \
diff --git a/core/dp/txrx/ol_rx_defrag.c b/core/dp/txrx/ol_rx_defrag.c
index eafb66448f..e6ab51253c 100644
--- a/core/dp/txrx/ol_rx_defrag.c
+++ b/core/dp/txrx/ol_rx_defrag.c
@@ -61,7 +61,7 @@
 #include <ol_ctrl_txrx_api.h>
 #include <ol_txrx_peer_find.h>
 #include <qdf_nbuf.h>
-#include <ieee80211.h>
+#include <linux/ieee80211.h>
 #include <qdf_util.h>
 #include <athdefs.h>
 #include <qdf_mem.h>
diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c
index 20c63e8fcd..a679bc7abd 100644
--- a/core/dp/txrx/ol_rx_reorder.c
+++ b/core/dp/txrx/ol_rx_reorder.c
@@ -30,7 +30,7 @@
 #include <qdf_nbuf.h>           /* qdf_nbuf_t, etc. */
 #include <qdf_mem.h>         /* qdf_mem_malloc */
 
-#include <ieee80211.h>          /* IEEE80211_SEQ_MAX */
+#include <linux/ieee80211.h>          /* IEEE80211_SEQ_MAX */
 
 /* external interfaces */
 #include <ol_txrx_api.h>        /* ol_txrx_pdev_handle */
diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c
index fd9c42c863..9c0940e725 100644
--- a/core/dp/txrx/ol_tx_send.c
+++ b/core/dp/txrx/ol_tx_send.c
@@ -33,7 +33,7 @@
 
 #include <cds_queue.h>          /* TAILQ */
 #ifdef QCA_COMPUTE_TX_DELAY
-#include <ieee80211.h>          /* ieee80211_frame, etc. */
+#include <linux/ieee80211.h>          /* ieee80211_frame, etc. */
 #include <enet.h>               /* ethernet_hdr_t, etc. */
 #include <ipv6_defs.h>          /* ipv6_traffic_class */
 #endif
diff --git a/core/dp/txrx/ol_txrx_encap.c b/core/dp/txrx/ol_txrx_encap.c
index 19e4c35ef4..8895aae731 100644
--- a/core/dp/txrx/ol_txrx_encap.c
+++ b/core/dp/txrx/ol_txrx_encap.c
@@ -37,7 +37,7 @@
 
 #include <qdf_nbuf.h>           /* qdf_nbuf_t, etc. */
 #include <cds_ieee80211_common.h>   /* ieee80211_frame */
-#include <net.h>                /* struct llc, struct ether_header, etc. */
+#include <linux/net.h>              /* struct llc, struct ether_header, etc. */
 #include <ol_txrx_internal.h>   /* TXRX_ASSERT1 */
 #include <ol_txrx_encap.h>      /* struct ol_rx_decap_info_t */
 
diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h
index 5a9f6b5944..075a2ecd5c 100644
--- a/core/dp/txrx/ol_txrx_internal.h
+++ b/core/dp/txrx/ol_txrx_internal.h
@@ -39,7 +39,7 @@
 #include <ol_txrx_dbg.h>
 #include <enet.h>               /* ETHERNET_HDR_LEN, etc. */
 #include <ipv4.h>               /* IPV4_HDR_LEN, etc. */
-#include <ipv6.h>               /* IPV6_HDR_LEN, etc. */
+#include <linux/ipv6.h>               /* IPV6_HDR_LEN, etc. */
 #include <ip_prot.h>            /* IP_PROTOCOL_TCP, etc. */
 
 #ifdef ATH_11AC_TXCOMPACT
diff --git a/core/hdd/inc/wlan_hdd_ftm.h b/core/hdd/inc/wlan_hdd_ftm.h
index 7f19d1c5c2..c0d75661b1 100644
--- a/core/hdd/inc/wlan_hdd_ftm.h
+++ b/core/hdd/inc/wlan_hdd_ftm.h
@@ -37,7 +37,6 @@
 #include "qdf_status.h"
 #include "scheduler_api.h"
 #include "cds_api.h"
-#include "msg.h"
 #include "qdf_types.h"
 #include <wlan_ptt_sock_svc.h>
 
diff --git a/core/hdd/src/wlan_hdd_ioctl.h b/core/hdd/src/wlan_hdd_ioctl.h
index a40e758fa4..bcd6ee0ba9 100644
--- a/core/hdd/src/wlan_hdd_ioctl.h
+++ b/core/hdd/src/wlan_hdd_ioctl.h
@@ -28,7 +28,7 @@
 #if !defined(WLAN_HDD_IOCTL_H)
 #define WLAN_HDD_IOCTL_H
 
-#include <netdevice.h>
+#include <linux/netdevice.h>
 #include <uapi/linux/if.h>
 #include "wlan_hdd_main.h"
 
diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c
index 4e1016b562..7048aae321 100644
--- a/core/hdd/src/wlan_hdd_ipa.c
+++ b/core/hdd/src/wlan_hdd_ipa.c
@@ -35,7 +35,7 @@
 #ifdef IPA_OFFLOAD
 
 /* Include Files */
-#include <ipa.h>
+#include <linux/ipa.h>
 #include <wlan_hdd_includes.h>
 #include <wlan_hdd_ipa.h>
 
diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c
index 337e2dde6c..16f9ed522d 100644
--- a/core/hdd/src/wlan_hdd_napi.c
+++ b/core/hdd/src/wlan_hdd_napi.c
@@ -30,7 +30,7 @@
  *
  * WLAN HDD NAPI interface implementation
  */
-#include <smp.h> /* get_cpu */
+#include <linux/smp.h> /* get_cpu */
 
 #include "wlan_hdd_napi.h"
 #include "cds_api.h"       /* cds_get_context */
diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h
index 4e61a5e21f..b74b6a589d 100644
--- a/uapi/linux/osapi_linux.h
+++ b/uapi/linux/osapi_linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -271,14 +271,14 @@ void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q);
 
 #ifdef ANDROID
 #ifndef err
-#include <errno.h>
+#include <linux/errno.h>
 #define err(_s, args ...) do { \
 		fprintf(stderr, "%s: line %d ", __FILE__, __LINE__); \
 		fprintf(stderr, args); fprintf(stderr, ": %d\n", errno); \
 		exit(_s); } while (0)
 #endif
 #else
-#include <err.h>
+#include <linux/err.h>
 #endif
 
 #endif /* __KERNEL__ */