qcacld-3.0: Prepend kernel includes with "kernel/"
To avoid include conflicts, prepend all kernel includes with "kernel/" Change-Id: I8a3f037c4abf07b129875b919225825701dc1046 CRs-Fixed: 2094774
此提交包含在:
2
Kbuild
2
Kbuild
@@ -1431,7 +1431,7 @@ endif
|
|||||||
TARGET_INC := -I$(WLAN_ROOT)/../fw-api/hw/qca6290/v2 \
|
TARGET_INC := -I$(WLAN_ROOT)/../fw-api/hw/qca6290/v2 \
|
||||||
-I$(WLAN_ROOT)/../fw-api/fw
|
-I$(WLAN_ROOT)/../fw-api/fw
|
||||||
|
|
||||||
LINUX_INC := -Iinclude/linux
|
LINUX_INC := -Iinclude
|
||||||
|
|
||||||
INCS := $(HDD_INC) \
|
INCS := $(HDD_INC) \
|
||||||
$(EPPING_INC) \
|
$(EPPING_INC) \
|
||||||
|
@@ -61,7 +61,7 @@
|
|||||||
#include <ol_ctrl_txrx_api.h>
|
#include <ol_ctrl_txrx_api.h>
|
||||||
#include <ol_txrx_peer_find.h>
|
#include <ol_txrx_peer_find.h>
|
||||||
#include <qdf_nbuf.h>
|
#include <qdf_nbuf.h>
|
||||||
#include <ieee80211.h>
|
#include <linux/ieee80211.h>
|
||||||
#include <qdf_util.h>
|
#include <qdf_util.h>
|
||||||
#include <athdefs.h>
|
#include <athdefs.h>
|
||||||
#include <qdf_mem.h>
|
#include <qdf_mem.h>
|
||||||
|
@@ -30,7 +30,7 @@
|
|||||||
#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
|
#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
|
||||||
#include <qdf_mem.h> /* qdf_mem_malloc */
|
#include <qdf_mem.h> /* qdf_mem_malloc */
|
||||||
|
|
||||||
#include <ieee80211.h> /* IEEE80211_SEQ_MAX */
|
#include <linux/ieee80211.h> /* IEEE80211_SEQ_MAX */
|
||||||
|
|
||||||
/* external interfaces */
|
/* external interfaces */
|
||||||
#include <ol_txrx_api.h> /* ol_txrx_pdev_handle */
|
#include <ol_txrx_api.h> /* ol_txrx_pdev_handle */
|
||||||
|
@@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
#include <cds_queue.h> /* TAILQ */
|
#include <cds_queue.h> /* TAILQ */
|
||||||
#ifdef QCA_COMPUTE_TX_DELAY
|
#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 <enet.h> /* ethernet_hdr_t, etc. */
|
||||||
#include <ipv6_defs.h> /* ipv6_traffic_class */
|
#include <ipv6_defs.h> /* ipv6_traffic_class */
|
||||||
#endif
|
#endif
|
||||||
|
@@ -37,7 +37,7 @@
|
|||||||
|
|
||||||
#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
|
#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
|
||||||
#include <cds_ieee80211_common.h> /* ieee80211_frame */
|
#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_internal.h> /* TXRX_ASSERT1 */
|
||||||
#include <ol_txrx_encap.h> /* struct ol_rx_decap_info_t */
|
#include <ol_txrx_encap.h> /* struct ol_rx_decap_info_t */
|
||||||
|
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
#include <ol_txrx_dbg.h>
|
#include <ol_txrx_dbg.h>
|
||||||
#include <enet.h> /* ETHERNET_HDR_LEN, etc. */
|
#include <enet.h> /* ETHERNET_HDR_LEN, etc. */
|
||||||
#include <ipv4.h> /* IPV4_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. */
|
#include <ip_prot.h> /* IP_PROTOCOL_TCP, etc. */
|
||||||
|
|
||||||
#ifdef ATH_11AC_TXCOMPACT
|
#ifdef ATH_11AC_TXCOMPACT
|
||||||
|
@@ -37,7 +37,6 @@
|
|||||||
#include "qdf_status.h"
|
#include "qdf_status.h"
|
||||||
#include "scheduler_api.h"
|
#include "scheduler_api.h"
|
||||||
#include "cds_api.h"
|
#include "cds_api.h"
|
||||||
#include "msg.h"
|
|
||||||
#include "qdf_types.h"
|
#include "qdf_types.h"
|
||||||
#include <wlan_ptt_sock_svc.h>
|
#include <wlan_ptt_sock_svc.h>
|
||||||
|
|
||||||
|
@@ -28,7 +28,7 @@
|
|||||||
#if !defined(WLAN_HDD_IOCTL_H)
|
#if !defined(WLAN_HDD_IOCTL_H)
|
||||||
#define WLAN_HDD_IOCTL_H
|
#define WLAN_HDD_IOCTL_H
|
||||||
|
|
||||||
#include <netdevice.h>
|
#include <linux/netdevice.h>
|
||||||
#include <uapi/linux/if.h>
|
#include <uapi/linux/if.h>
|
||||||
#include "wlan_hdd_main.h"
|
#include "wlan_hdd_main.h"
|
||||||
|
|
||||||
|
@@ -35,7 +35,7 @@
|
|||||||
#ifdef IPA_OFFLOAD
|
#ifdef IPA_OFFLOAD
|
||||||
|
|
||||||
/* Include Files */
|
/* Include Files */
|
||||||
#include <ipa.h>
|
#include <linux/ipa.h>
|
||||||
#include <wlan_hdd_includes.h>
|
#include <wlan_hdd_includes.h>
|
||||||
#include <wlan_hdd_ipa.h>
|
#include <wlan_hdd_ipa.h>
|
||||||
|
|
||||||
|
@@ -30,7 +30,7 @@
|
|||||||
*
|
*
|
||||||
* WLAN HDD NAPI interface implementation
|
* WLAN HDD NAPI interface implementation
|
||||||
*/
|
*/
|
||||||
#include <smp.h> /* get_cpu */
|
#include <linux/smp.h> /* get_cpu */
|
||||||
|
|
||||||
#include "wlan_hdd_napi.h"
|
#include "wlan_hdd_napi.h"
|
||||||
#include "cds_api.h" /* cds_get_context */
|
#include "cds_api.h" /* cds_get_context */
|
||||||
|
@@ -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.
|
* 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
|
#ifdef ANDROID
|
||||||
#ifndef err
|
#ifndef err
|
||||||
#include <errno.h>
|
#include <linux/errno.h>
|
||||||
#define err(_s, args ...) do { \
|
#define err(_s, args ...) do { \
|
||||||
fprintf(stderr, "%s: line %d ", __FILE__, __LINE__); \
|
fprintf(stderr, "%s: line %d ", __FILE__, __LINE__); \
|
||||||
fprintf(stderr, args); fprintf(stderr, ": %d\n", errno); \
|
fprintf(stderr, args); fprintf(stderr, ": %d\n", errno); \
|
||||||
exit(_s); } while (0)
|
exit(_s); } while (0)
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#include <err.h>
|
#include <linux/err.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* __KERNEL__ */
|
#endif /* __KERNEL__ */
|
||||||
|
新增問題並參考
封鎖使用者