diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-27 15:16:43 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-27 15:16:43 -0400 |
| commit | 4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f (patch) | |
| tree | 587ffa9493e4b6af014f9acb2c09177c2c54af3b /include | |
| parent | afa762f6871a8cb05fbef5d0f83fac14304aa816 (diff) | |
| parent | 985140369be1e886754d8ac0375dd64e4f727311 (diff) | |
| download | linux-4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f.tar.gz linux-4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f.tar.bz2 linux-4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 6822d2595aff..db1c5df45224 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -314,6 +314,7 @@ struct hci_conn { __u8 remote_cap; __u8 remote_auth; + bool flush_key; unsigned int sent; @@ -980,7 +981,7 @@ int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable); int mgmt_connectable(struct hci_dev *hdev, u8 connectable); int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status); int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, - u8 persistent); + bool persistent); int mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, u8 addr_type, u32 flags, u8 *name, u8 name_len, u8 *dev_class); |