diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-01-28 16:23:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-28 16:23:14 -0500 |
| commit | 3e11210d46a4f252f41db6e442b46026aeddbb59 (patch) | |
| tree | b258375de649a5e04e8d567c850b47c41f8ceb11 /include/net | |
| parent | 3bf63e59e577cbecd41334c866f501c4cc5d54c5 (diff) | |
| parent | c7c1806098752c1f46943d8db2c69aff07f5d4bc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/init.c
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index a29feb01854..d2cf8840769 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; |