diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2014-04-14 18:24:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-14 18:24:13 +0000 |
commit | a75f4ba5c2b98d5ccf7cab5196ce43a798acd1d4 (patch) | |
tree | 1049dc08661c5359e60471c757cf0354292ee5cf | |
parent | c26f454f8d841657542916cdd140a9896a89ad20 (diff) | |
parent | cd56eb51af1113872eec7c733631e03953e529da (diff) | |
download | hardware_libhardware_legacy-a75f4ba5c2b98d5ccf7cab5196ce43a798acd1d4.zip hardware_libhardware_legacy-a75f4ba5c2b98d5ccf7cab5196ce43a798acd1d4.tar.gz hardware_libhardware_legacy-a75f4ba5c2b98d5ccf7cab5196ce43a798acd1d4.tar.bz2 |
Merge "wifi: Sync with wpa_supplicant commit 7dba0e5 (bacb984)"
-rw-r--r-- | include/hardware_legacy/driver_nl80211.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/hardware_legacy/driver_nl80211.h b/include/hardware_legacy/driver_nl80211.h index 83d89af..25f5970 100644 --- a/include/hardware_legacy/driver_nl80211.h +++ b/include/hardware_legacy/driver_nl80211.h @@ -1,6 +1,6 @@ /* * Driver interaction with Linux nl80211/cfg80211 - * Copyright (c) 2002-2012, Jouni Malinen <j@w1.fi> + * Copyright (c) 2002-2014, Jouni Malinen <j@w1.fi> * Copyright (c) 2003-2004, Instant802 Networks, Inc. * Copyright (c) 2005-2006, Devicescape Software, Inc. * Copyright (c) 2007, Johannes Berg <johannes@sipsolutions.net> @@ -167,10 +167,14 @@ struct wpa_driver_nl80211_data { unsigned int retry_auth:1; unsigned int use_monitor:1; unsigned int ignore_next_local_disconnect:1; + unsigned int ignore_next_local_deauth:1; unsigned int allow_p2p_device:1; unsigned int hostapd:1; unsigned int start_mode_ap:1; unsigned int start_iface_up:1; + unsigned int test_use_roc_tx:1; + unsigned int ignore_deauth_event:1; + unsigned int dfs_vendor_cmd_avail:1; u64 remain_on_chan_cookie; u64 send_action_cookie; |