diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2014-10-06 23:40:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 23:40:56 +0000 |
| commit | f0bc19a509ccd1448b0f266d0f7c984a16e450b5 (patch) | |
| tree | 5556d41475bced6cca526ce2cf9b0aefbf0c67f1 | |
| parent | 38eac43c27afaef74831e5a24654c9b68691e415 (diff) | |
| parent | 9dd37a671485efd40db73335ba2f0f5a87555e46 (diff) | |
| download | hardware_libhardware_legacy-f0bc19a509ccd1448b0f266d0f7c984a16e450b5.zip hardware_libhardware_legacy-f0bc19a509ccd1448b0f266d0f7c984a16e450b5.tar.gz hardware_libhardware_legacy-f0bc19a509ccd1448b0f266d0f7c984a16e450b5.tar.bz2 | |
am 9dd37a67: wifi: Sync with wpa_supplicant commit 661b4f7 (a313d17)
* commit '9dd37a671485efd40db73335ba2f0f5a87555e46':
wifi: Sync with wpa_supplicant commit 661b4f7 (a313d17)
| -rw-r--r-- | include/hardware_legacy/driver_nl80211.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/hardware_legacy/driver_nl80211.h b/include/hardware_legacy/driver_nl80211.h index 40c941a..d9a9c81 100644 --- a/include/hardware_legacy/driver_nl80211.h +++ b/include/hardware_legacy/driver_nl80211.h @@ -22,6 +22,9 @@ #include <netlink/genl/genl.h> #include <netlink/genl/family.h> #include <netlink/genl/ctrl.h> +#ifdef CONFIG_LIBNL3_ROUTE +#include <netlink/route/neighbour.h> +#endif /* CONFIG_LIBNL3_ROUTE */ #include <linux/rtnetlink.h> #include <netpacket/packet.h> #include <linux/filter.h> @@ -123,6 +126,7 @@ struct wpa_driver_nl80211_data { struct dl_list list; struct dl_list wiphy_list; char phyname[32]; + u8 perm_addr[ETH_ALEN]; void *ctx; int ifindex; int if_removed; @@ -177,8 +181,11 @@ struct wpa_driver_nl80211_data { unsigned int start_iface_up:1; unsigned int test_use_roc_tx:1; unsigned int ignore_deauth_event:1; + unsigned int roaming_vendor_cmd_avail:1; unsigned int dfs_vendor_cmd_avail:1; unsigned int have_low_prio_scan:1; + unsigned int force_connect_cmd:1; + unsigned int addr_changed:1; u64 remain_on_chan_cookie; u64 send_action_cookie; @@ -194,6 +201,8 @@ struct wpa_driver_nl80211_data { int eapol_sock; /* socket for EAPOL frames */ + struct nl_sock *rtnl_sk; /* nl_sock for NETLINK_ROUTE */ + int default_if_indices[16]; int *if_indices; int num_if_indices; |