diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-16 04:42:28 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-07-16 05:04:23 -0400 |
commit | e804d25d4a07c0ff9e5e1c58ea5ee67232aa9af8 (patch) | |
tree | b52e7927dace2aa691585d9dd12534d36ade1b87 /include | |
parent | 40bef302f6323d1ee6fb3dc0e62edb0f446d0339 (diff) |
Bluetooth: Use explicit role instead of a bool in function parameters
To make the code more understandable it makes sense to use the new HCI
defines for connection role instead of a "bool master" parameter. This
makes it immediately clear when looking at the function calls what the
last parameter is describing.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/bluetooth/hci_core.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index e335c5fd8824..abe5083becd3 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -707,7 +707,7 @@ struct hci_chan *hci_chan_lookup_handle(struct hci_dev *hdev, __u16 handle); | |||
707 | 707 | ||
708 | struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst, | 708 | struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst, |
709 | u8 dst_type, u8 sec_level, u16 conn_timeout, | 709 | u8 dst_type, u8 sec_level, u16 conn_timeout, |
710 | bool master); | 710 | u8 role); |
711 | struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst, | 711 | struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst, |
712 | u8 sec_level, u8 auth_type); | 712 | u8 sec_level, u8 auth_type); |
713 | struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst, | 713 | struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst, |
@@ -881,12 +881,12 @@ struct link_key *hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, | |||
881 | bdaddr_t *bdaddr, u8 *val, u8 type, | 881 | bdaddr_t *bdaddr, u8 *val, u8 type, |
882 | u8 pin_len, bool *persistent); | 882 | u8 pin_len, bool *persistent); |
883 | struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, __le64 rand, | 883 | struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, __le64 rand, |
884 | bool master); | 884 | u8 role); |
885 | struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, | 885 | struct smp_ltk *hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, |
886 | u8 addr_type, u8 type, u8 authenticated, | 886 | u8 addr_type, u8 type, u8 authenticated, |
887 | u8 tk[16], u8 enc_size, __le16 ediv, __le64 rand); | 887 | u8 tk[16], u8 enc_size, __le16 ediv, __le64 rand); |
888 | struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr, | 888 | struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr, |
889 | u8 addr_type, bool master); | 889 | u8 addr_type, u8 role); |
890 | int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type); | 890 | int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 bdaddr_type); |
891 | void hci_smp_ltks_clear(struct hci_dev *hdev); | 891 | void hci_smp_ltks_clear(struct hci_dev *hdev); |
892 | int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr); | 892 | int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr); |