浏览代码

qcacmn: Add CONFIG_CNSS_OUT_OF_TREE flag

Use CONFIG_CNSS_OUT_OF_TREE to control if CNSS family drivers are
built from in-kernel-tree source or out-of-kernel-tree source since
the exposed header files will be in different paths. This is also
for backward compatibility.

Change-Id: I698492f175ea140e6854c372f366a63f36de24c9
CRs-fixed: 3022556
Yue Ma 4 年之前
父节点
当前提交
674474c55a

+ 4 - 0
os_if/linux/spectral/src/os_if_spectral_netlink.c

@@ -24,8 +24,12 @@
 #include <wlan_nlink_common.h>
 #include <qdf_module.h>
 #ifdef CNSS_GENL
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss_nl.h"
+#else
 #include <net/cnss_nl.h>
 #endif
+#endif
 #include <wlan_cfg80211.h>
 
 /**

+ 4 - 0
os_if/linux/wifi_pos/src/os_if_wifi_pos.c

@@ -32,7 +32,11 @@
 #include "wlan_cfg80211.h"
 #include "wlan_objmgr_psoc_obj.h"
 #ifdef CNSS_GENL
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss_nl.h"
+#else
 #include <net/cnss_nl.h>
+#endif
 #include "linux/genetlink.h"
 #include "wifi_pos_utils_pub.h"
 #endif

+ 4 - 0
utils/fwlog/dbglog_host.c

@@ -38,7 +38,11 @@
 #include "wmi_unified_priv.h"
 
 #ifdef CNSS_GENL
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss_nl.h"
+#else
 #include <net/cnss_nl.h>
+#endif
 #include "wlan_cfg80211.h"
 #endif
 

+ 4 - 0
utils/logging/src/wlan_logging_sock_svc.c

@@ -38,8 +38,12 @@
 #include <qdf_str.h>
 
 #ifdef CNSS_GENL
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss_nl.h"
+#else
 #include <net/cnss_nl.h>
 #endif
+#endif
 
 #if defined(FEATURE_FW_LOG_PARSING) || defined(FEATURE_WLAN_DIAG_SUPPORT) || \
 	defined(FEATURE_PKTLOG)

+ 5 - 1
utils/nlink/src/wlan_nlink_srv.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -265,7 +265,11 @@ qdf_export_symbol(nl_srv_is_initialized);
 #include <qdf_mem.h>
 #include <wlan_nlink_common.h>
 #include <net/genetlink.h>
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss_nl.h"
+#else
 #include <net/cnss_nl.h>
+#endif
 
 void cld80211_oem_send_reply(struct sk_buff *msg, void *hdr,
 				    struct nlattr *nest, int flags)

+ 5 - 1
utils/ptt/src/wlan_ptt_sock_svc.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -31,7 +31,11 @@
 #include <qdf_trace.h>
 
 #ifdef CNSS_GENL
+#ifdef CONFIG_CNSS_OUT_OF_TREE
+#include "cnss_nl.h"
+#else
 #include <net/cnss_nl.h>
+#endif
 #include <wlan_cfg80211.h>
 #endif