diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2014-07-01 04:59:24 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-07-03 11:42:52 -0400 |
commit | f81cd823a844c60349c40b53a1b84b5968113596 (patch) | |
tree | 8589bf94ed318e334d911d910f72b34f8185a928 /net | |
parent | 81218d2099e85542a57e266336db5e0585c9f2cc (diff) |
Bluetooth: Use bool for smp_ltk_encrypt return value
The return value of smp_ltk_encrypt is simple boolean, so just use
bool and make the code a bit more readable.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/smp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 414c5151aa46..35f57090ddd0 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c | |||
@@ -837,7 +837,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb) | |||
837 | return smp_random(smp); | 837 | return smp_random(smp); |
838 | } | 838 | } |
839 | 839 | ||
840 | static u8 smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level) | 840 | static bool smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level) |
841 | { | 841 | { |
842 | struct smp_ltk *key; | 842 | struct smp_ltk *key; |
843 | struct hci_conn *hcon = conn->hcon; | 843 | struct hci_conn *hcon = conn->hcon; |
@@ -845,18 +845,18 @@ static u8 smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level) | |||
845 | key = hci_find_ltk_by_addr(hcon->hdev, &hcon->dst, hcon->dst_type, | 845 | key = hci_find_ltk_by_addr(hcon->hdev, &hcon->dst, hcon->dst_type, |
846 | hcon->out); | 846 | hcon->out); |
847 | if (!key) | 847 | if (!key) |
848 | return 0; | 848 | return false; |
849 | 849 | ||
850 | if (sec_level > BT_SECURITY_MEDIUM && !key->authenticated) | 850 | if (sec_level > BT_SECURITY_MEDIUM && !key->authenticated) |
851 | return 0; | 851 | return false; |
852 | 852 | ||
853 | if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &hcon->flags)) | 853 | if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &hcon->flags)) |
854 | return 1; | 854 | return true; |
855 | 855 | ||
856 | hci_le_start_enc(hcon, key->ediv, key->rand, key->val); | 856 | hci_le_start_enc(hcon, key->ediv, key->rand, key->val); |
857 | hcon->enc_key_size = key->enc_size; | 857 | hcon->enc_key_size = key->enc_size; |
858 | 858 | ||
859 | return 1; | 859 | return true; |
860 | } | 860 | } |
861 | 861 | ||
862 | static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb) | 862 | static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb) |