diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 02:32:18 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 02:33:14 -0500 |
| commit | f19693a17c6705e197eb24d4618060eaac1b535c (patch) | |
| tree | fc39dc23297c0e6be730cb0dfd74a34d9c0b8bfd /include/net/bluetooth/hci_core.h | |
| parent | 23b120cdfae4f5c29da69de750d545bad719ead4 (diff) | |
| parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39
Conflicts:
arch/arm/mach-mxs/clock-mx28.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include/net/bluetooth/hci_core.h')
| -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; |