tequilaOS/platform_hardware_libhardware_legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 9dd37a67: wifi: Sync with wpa_supplicant commit 661b4f7 (a313d17)

Browse source 
* commit '9dd37a671485efd40db73335ba2f0f5a87555e46':
  wifi: Sync with wpa_supplicant commit 661b4f7 (a313d17)
This commit is contained in:
Dmitry Shmidt 2014-10-06 23:40:56 +00:00 committed by Android Git Automerger
commit f0bc19a509
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/hardware_legacy/driver_nl80211.h
View file

@ -22,6 +22,9 @@
#include <netlink/genl/genl.h> #include <netlink/genl/genl.h>
#include <netlink/genl/family.h> #include <netlink/genl/family.h>
#include <netlink/genl/ctrl.h> #include <netlink/genl/ctrl.h>
#ifdef CONFIG_LIBNL3_ROUTE
#include <netlink/route/neighbour.h>
#endif /* CONFIG_LIBNL3_ROUTE */
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <netpacket/packet.h> #include <netpacket/packet.h>
#include <linux/filter.h> #include <linux/filter.h>
@ -123,6 +126,7 @@ struct wpa_driver_nl80211_data {
struct dl_list list; struct dl_list list;
struct dl_list wiphy_list; struct dl_list wiphy_list;
char phyname[32]; char phyname[32];
u8 perm_addr[ETH_ALEN];
void *ctx; void *ctx;
int ifindex; int ifindex;
int if_removed; int if_removed;
@ -177,8 +181,11 @@ struct wpa_driver_nl80211_data {
unsigned int start_iface_up:1; unsigned int start_iface_up:1;
unsigned int test_use_roc_tx:1; unsigned int test_use_roc_tx:1;
unsigned int ignore_deauth_event:1; unsigned int ignore_deauth_event:1;
unsigned int roaming_vendor_cmd_avail:1;
unsigned int dfs_vendor_cmd_avail:1; unsigned int dfs_vendor_cmd_avail:1;
unsigned int have_low_prio_scan: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 remain_on_chan_cookie;
u64 send_action_cookie; u64 send_action_cookie;
@ -194,6 +201,8 @@ struct wpa_driver_nl80211_data {
int eapol_sock; /* socket for EAPOL frames */ int eapol_sock; /* socket for EAPOL frames */
struct nl_sock *rtnl_sk; /* nl_sock for NETLINK_ROUTE */
int default_if_indices[16]; int default_if_indices[16];
int *if_indices; int *if_indices;
int num_if_indices; int num_if_indices;