diff options
| author | Paul Stewart <pstew@google.com> | 2016-11-11 12:11:20 -0800 |
|---|---|---|
| committer | Paul Stewart <pstew@google.com> | 2016-11-11 12:12:18 -0800 |
| commit | 29f65dcaa8a536d6d9b558eec57f7752ff0073e5 (patch) | |
| tree | 3352dcd857f7b9219ea04ba41980655073fb0186 | |
| parent | bc33454e666a54f0a0a5bc6de2f4b30ada072063 (diff) | |
| download | wlan-29f65dcaa8a536d6d9b558eec57f7752ff0073e5.tar.gz | |
Update for libnl 3.2.25
NL headers have moved. Private headers are now in their own
subdirectory.
Bug: 32700211
Test: Compile, connect to WiFi, run "iw link"
Change-Id: I69fd006ebe3048538d563d1f91ccf15ebfabd8db
| -rw-r--r-- | qcwcn/wifi_hal/common.cpp | 4 | ||||
| -rw-r--r-- | qcwcn/wifi_hal/common.h | 1 | ||||
| -rw-r--r-- | qcwcn/wifi_hal/cpp_bindings.cpp | 1 | ||||
| -rw-r--r-- | qcwcn/wifi_hal/llstatscommand.h | 1 | ||||
| -rwxr-xr-x | qcwcn/wifi_hal/tdlsCommand.h | 1 | ||||
| -rw-r--r-- | qcwcn/wifi_hal/wifi_hal.cpp | 3 |
6 files changed, 4 insertions, 7 deletions
diff --git a/qcwcn/wifi_hal/common.cpp b/qcwcn/wifi_hal/common.cpp index 68b9130..efd40c4 100644 --- a/qcwcn/wifi_hal/common.cpp +++ b/qcwcn/wifi_hal/common.cpp @@ -17,12 +17,12 @@ #include <stdlib.h> #include <linux/pkt_sched.h> #include <netlink/object-api.h> -#include <netlink-types.h> +#include <netlink-private/object-api.h> +#include <netlink-private/types.h> #include <dlfcn.h> #include "wifi_hal.h" #include "common.h" -#include <netlink-types.h> interface_info *getIfaceInfo(wifi_interface_handle handle) { diff --git a/qcwcn/wifi_hal/common.h b/qcwcn/wifi_hal/common.h index f0b8373..c62090e 100644 --- a/qcwcn/wifi_hal/common.h +++ b/qcwcn/wifi_hal/common.h @@ -39,7 +39,6 @@ #include <netlink/object-api.h> #include <netlink/netlink.h> #include <netlink/socket.h> -#include <netlink-types.h> #include "nl80211_copy.h" diff --git a/qcwcn/wifi_hal/cpp_bindings.cpp b/qcwcn/wifi_hal/cpp_bindings.cpp index f702d34..490c848 100644 --- a/qcwcn/wifi_hal/cpp_bindings.cpp +++ b/qcwcn/wifi_hal/cpp_bindings.cpp @@ -29,7 +29,6 @@ #include <netlink/object-api.h> #include <netlink/netlink.h> #include <netlink/socket.h> -#include <netlink-types.h> #include <net/if.h> #include "nl80211_copy.h" diff --git a/qcwcn/wifi_hal/llstatscommand.h b/qcwcn/wifi_hal/llstatscommand.h index ae75b54..41de772 100644 --- a/qcwcn/wifi_hal/llstatscommand.h +++ b/qcwcn/wifi_hal/llstatscommand.h @@ -32,7 +32,6 @@ #include <netlink/object-api.h> #include <netlink/netlink.h> #include <netlink/socket.h> -#include <netlink-types.h> #include <net/if.h> #include "nl80211_copy.h" diff --git a/qcwcn/wifi_hal/tdlsCommand.h b/qcwcn/wifi_hal/tdlsCommand.h index 1ee9e32..5e20401 100755 --- a/qcwcn/wifi_hal/tdlsCommand.h +++ b/qcwcn/wifi_hal/tdlsCommand.h @@ -44,7 +44,6 @@ #include <netlink/object-api.h> #include <netlink/netlink.h> #include <netlink/socket.h> -#include <netlink-types.h> #include <net/if.h> #include "nl80211_copy.h" diff --git a/qcwcn/wifi_hal/wifi_hal.cpp b/qcwcn/wifi_hal/wifi_hal.cpp index c8082cb..02fc89c 100644 --- a/qcwcn/wifi_hal/wifi_hal.cpp +++ b/qcwcn/wifi_hal/wifi_hal.cpp @@ -30,7 +30,8 @@ #include <netlink/object-api.h> #include <netlink/netlink.h> #include <netlink/socket.h> -#include <netlink-types.h> +#include <netlink-private/object-api.h> +#include <netlink-private/types.h> #include "nl80211_copy.h" |