diff options
| author | Christopher Ferris <cferris@google.com> | 2024-04-16 11:17:50 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2024-04-16 14:36:27 -0700 |
| commit | ceb7eea45d0bdc84b31a4d608589671264ca9fed (patch) | |
| tree | f3ab480f65f783ca32ab488e85212fe83007159b | |
| parent | 2dfae3b8cb7827b19cda68a514d34bc32036b80c (diff) | |
| download | wlan-ceb7eea45d0bdc84b31a4d608589671264ca9fed.tar.gz | |
Update references to internal libnl headers.
Allow the code to compile with new version of libnl.
Also remove unneeded references to internal libnl includes.
Bug: 335246319
Test: Builds.
Change-Id: Ibd17da006480890fcfd802b3d9c415af986c116d
| -rw-r--r-- | legacy/qcwcn/wifi_hal/common.cpp | 2 | ||||
| -rw-r--r-- | legacy/qcwcn/wifi_hal/wifi_hal.cpp | 4 | ||||
| -rw-r--r-- | wcn6740/qcwcn/wifi_hal/common.cpp | 2 | ||||
| -rw-r--r-- | wcn6740/qcwcn/wifi_hal/wifi_hal.cpp | 4 |
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" |