summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-01-17 13:54:53 -0800
committerDmitry Shmidt <dimitrysh@google.com>2013-01-17 13:54:53 -0800
commit07ac8d0a4a06b7ab73ca80c27ba1dc59c3a05c8a (patch)
tree237ab3d9c95a013fd877f6fde17c70ae55b0cfe1
parent1c438b96bd7573b4033de6751ec69d026a2323b9 (diff)
downloadwlan-07ac8d0a4a06b7ab73ca80c27ba1dc59c3a05c8a.tar.gz
wpa_supplicant_lib: Sync with Ver 2.1-dev structures
Change-Id: I00ab58fbad22fcf830e8553732a9399c018824ff Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--qcwcn/wpa_supplicant_8_lib/driver_nl80211.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/qcwcn/wpa_supplicant_8_lib/driver_nl80211.h b/qcwcn/wpa_supplicant_8_lib/driver_nl80211.h
index 72b1f81..5b72800 100644
--- a/qcwcn/wpa_supplicant_8_lib/driver_nl80211.h
+++ b/qcwcn/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"
@@ -103,6 +100,7 @@ struct i802_bss {
int freq;
+ void *ctx;
struct nl_handle *nl_preq, *nl_mgmt;
struct nl_cb *nl_cb;
@@ -152,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;