aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-26 11:49:49 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-26 11:49:49 -0800
commit9b6941d8b103fe95d1a90b7996046be9ee0e55e4 (patch)
tree03c4e26abb8d6212741c3821061f2f40f2b5c8ec /include
parentbonding: update documentation - alternate configuration. (diff)
parentMAINTAINERS: remove Reinette Chatre as iwlwifi maintainer (diff)
downloadlinux-dev-9b6941d8b103fe95d1a90b7996046be9ee0e55e4.tar.xz
linux-dev-9b6941d8b103fe95d1a90b7996046be9ee0e55e4.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/hci_core.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index a29feb01854e..d2cf88407690 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -184,6 +184,7 @@ struct hci_conn {
__u32 link_mode;
__u8 auth_type;
__u8 sec_level;
+ __u8 pending_sec_level;
__u8 power_save;
__u16 disc_timeout;
unsigned long pend;