summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-07-12 10:10:40 -0700
committerDmitry Shmidt <dimitrysh@google.com>2013-07-12 10:10:40 -0700
commit41d40cfaa6e7907d0a75c17dce8787fa172b57e0 (patch)
treed3a87b534d6327a8eb507a234aa37860bf1a4cad
parent6fd6f41c1167953043ade42447e9a146ac262acc (diff)
downloadlibhardware_legacy-41d40cfaa6e7907d0a75c17dce8787fa172b57e0.tar.gz
wifi: Sync with wpa_supplicant commit 1075b29
Change-Id: I502a925054c13f3ceb43445e1c4703427ed4ca7f Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--include/hardware_legacy/driver_nl80211.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/hardware_legacy/driver_nl80211.h b/include/hardware_legacy/driver_nl80211.h
index dd1d01d..eac0879 100644
--- a/include/hardware_legacy/driver_nl80211.h
+++ b/include/hardware_legacy/driver_nl80211.h
@@ -65,6 +65,8 @@
struct nl80211_global {
struct dl_list interfaces;
int if_add_ifindex;
+ u64 if_add_wdevid;
+ int if_add_wdevid_set;
struct netlink_data *netlink;
struct nl_cb *nl_cb;
struct nl_handle *nl;
@@ -89,12 +91,14 @@ struct i802_bss {
struct wpa_driver_nl80211_data *drv;
struct i802_bss *next;
int ifindex;
+ u64 wdev_id;
char ifname[IFNAMSIZ + 1];
char brname[IFNAMSIZ];
unsigned int beacon_set:1;
unsigned int added_if_into_bridge:1;
unsigned int added_bridge:1;
unsigned int in_deinit:1;
+ unsigned int wdev_id_set:1;
u8 addr[ETH_ALEN];
@@ -155,6 +159,7 @@ struct wpa_driver_nl80211_data {
unsigned int retry_auth:1;
unsigned int use_monitor:1;
unsigned int ignore_next_local_disconnect:1;
+ unsigned int allow_p2p_device:1;
u64 remain_on_chan_cookie;
u64 send_action_cookie;