summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenato Grottesi <otaner@google.com>2024-04-17 08:01:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-04-17 08:01:45 +0000
commit2254a0170990353325064e2d883596c1d2eaef87 (patch)
treef3ab480f65f783ca32ab488e85212fe83007159b
parent2dfae3b8cb7827b19cda68a514d34bc32036b80c (diff)
parentceb7eea45d0bdc84b31a4d608589671264ca9fed (diff)
downloadwlan-master.tar.gz
Merge "Update references to internal libnl headers." into mainHEADmastermain
-rw-r--r--legacy/qcwcn/wifi_hal/common.cpp2
-rw-r--r--legacy/qcwcn/wifi_hal/wifi_hal.cpp4
-rw-r--r--wcn6740/qcwcn/wifi_hal/common.cpp2
-rw-r--r--wcn6740/qcwcn/wifi_hal/wifi_hal.cpp4
4 files changed, 8 insertions, 4 deletions
diff --git a/legacy/qcwcn/wifi_hal/common.cpp b/legacy/qcwcn/wifi_hal/common.cpp
index 60bb2dc..20bbb65 100644
--- a/legacy/qcwcn/wifi_hal/common.cpp
+++ b/legacy/qcwcn/wifi_hal/common.cpp
@@ -17,8 +17,6 @@
#include <stdlib.h>
#include <linux/pkt_sched.h>
#include <netlink/object-api.h>
-#include <netlink-private/object-api.h>
-#include <netlink-private/types.h>
#include <dlfcn.h>
#include <pthread.h>
diff --git a/legacy/qcwcn/wifi_hal/wifi_hal.cpp b/legacy/qcwcn/wifi_hal/wifi_hal.cpp
index d4f97a0..3b452cf 100644
--- a/legacy/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/legacy/qcwcn/wifi_hal/wifi_hal.cpp
@@ -64,8 +64,12 @@
#include <netlink/object-api.h>
#include <netlink/netlink.h>
#include <netlink/socket.h>
+#if __has_include(<netlink-private/types.h>)
#include <netlink-private/object-api.h>
#include <netlink-private/types.h>
+#else
+#include <nl-priv-dynamic-core/nl-core.h>
+#endif
#include "nl80211_copy.h"
diff --git a/wcn6740/qcwcn/wifi_hal/common.cpp b/wcn6740/qcwcn/wifi_hal/common.cpp
index 9123fb9..83675aa 100644
--- a/wcn6740/qcwcn/wifi_hal/common.cpp
+++ b/wcn6740/qcwcn/wifi_hal/common.cpp
@@ -18,8 +18,6 @@
#include <linux/pkt_sched.h>
#include <linux-private/linux/fib_rules.h>
#include <netlink/object-api.h>
-#include <netlink-private/object-api.h>
-#include <netlink-private/types.h>
#include <dlfcn.h>
#include <pthread.h>
#include <hardware_legacy/wifi_hal.h>
diff --git a/wcn6740/qcwcn/wifi_hal/wifi_hal.cpp b/wcn6740/qcwcn/wifi_hal/wifi_hal.cpp
index c78a63e..b8f3753 100644
--- a/wcn6740/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/wcn6740/qcwcn/wifi_hal/wifi_hal.cpp
@@ -64,8 +64,12 @@
#include <netlink/object-api.h>
#include <netlink/netlink.h>
#include <netlink/socket.h>
+#if __has_include(<netlink-private/types.h>)
#include <netlink-private/object-api.h>
#include <netlink-private/types.h>
+#else
+#include <nl-priv-dynamic-core/nl-core.h>
+#endif
#include "nl80211_copy.h"