diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-01-16 15:51:37 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-01-16 15:51:37 -0800 |
| commit | 293d207fb55f4728403c0e28283b4a0f28835def (patch) | |
| tree | 6e53e3160bf326bfc1025d43d089e07499cafe04 /bcmdhd | |
| parent | b7a3187fbbba0991b789298cb208d913334a6acb (diff) | |
| download | hardware_broadcom_wlan-293d207fb55f4728403c0e28283b4a0f28835def.zip hardware_broadcom_wlan-293d207fb55f4728403c0e28283b4a0f28835def.tar.gz hardware_broadcom_wlan-293d207fb55f4728403c0e28283b4a0f28835def.tar.bz2 | |
wpa_supplicant_lib: Sync with Ver 2.1-dev structures
Change-Id: I66330560796a834f697e63146499fd0ea61b93d6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'bcmdhd')
| -rw-r--r-- | bcmdhd/wpa_supplicant_8_lib/driver_nl80211.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bcmdhd/wpa_supplicant_8_lib/driver_nl80211.h b/bcmdhd/wpa_supplicant_8_lib/driver_nl80211.h index 941eea9..5b72800 100644 --- a/bcmdhd/wpa_supplicant_8_lib/driver_nl80211.h +++ b/bcmdhd/wpa_supplicant_8_lib/driver_nl80211.h @@ -1,19 +1,13 @@ /* * Driver interaction with Linux nl80211/cfg80211 - * Copyright (c) 2002-2010, Jouni Malinen <j@w1.fi> + * Copyright (c) 2002-2012, 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> * Copyright (c) 2009-2010, Atheros Communications * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Alternatively, this software may be distributed under the terms of BSD - * license. - * - * See README and COPYING for more details. + * This software may be distributed under the terms of the BSD license. + * See README for more details. */ #ifndef _DRIVER_NL80211_H_ @@ -31,12 +25,15 @@ #include <linux/rtnetlink.h> #include <netpacket/packet.h> #include <linux/filter.h> +#include <linux/errqueue.h> #include "nl80211_copy.h" #include "common.h" #include "eloop.h" #include "utils/list.h" #include "common/ieee802_11_defs.h" +#include "common/ieee802_11_common.h" +#include "l2_packet/l2_packet.h" #include "netlink.h" #include "linux_ioctl.h" #include "radiotap.h" @@ -97,11 +94,13 @@ struct i802_bss { unsigned int beacon_set:1; unsigned int added_if_into_bridge:1; unsigned int added_bridge:1; + unsigned int in_deinit:1; u8 addr[ETH_ALEN]; int freq; + void *ctx; struct nl_handle *nl_preq, *nl_mgmt; struct nl_cb *nl_cb; @@ -151,6 +150,7 @@ struct wpa_driver_nl80211_data { unsigned int scan_for_auth:1; unsigned int retry_auth:1; unsigned int use_monitor:1; + unsigned int ignore_next_local_disconnect:1; u64 remain_on_chan_cookie; u64 send_action_cookie; |