diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-26 14:49:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-26 14:49:49 -0500 |
| commit | 9b6941d8b103fe95d1a90b7996046be9ee0e55e4 (patch) | |
| tree | 03c4e26abb8d6212741c3821061f2f40f2b5c8ec /include/net | |
| parent | de221bd5eb5e754806fcc39c40bb12b96515d9c5 (diff) | |
| parent | acd9f9cc305ca2e5da2a39f6f6160cd4b476e38b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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 a29feb01854e..d2cf88407690 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
| @@ -184,6 +184,7 @@ struct hci_conn { | |||
| 184 | __u32 link_mode; | 184 | __u32 link_mode; |
| 185 | __u8 auth_type; | 185 | __u8 auth_type; |
| 186 | __u8 sec_level; | 186 | __u8 sec_level; |
| 187 | __u8 pending_sec_level; | ||
| 187 | __u8 power_save; | 188 | __u8 power_save; |
| 188 | __u16 disc_timeout; | 189 | __u16 disc_timeout; |
| 189 | unsigned long pend; | 190 | unsigned long pend; |