]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Bluetooth: Add clarifying comment when setting local OOB flag
authorJohan Hedberg <johan.hedberg@intel.com>
Mon, 16 Mar 2015 19:12:34 +0000 (21:12 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Mon, 16 Mar 2015 19:16:08 +0000 (20:16 +0100)
It might be a bit counterintuitive to set a 'local' flag based on remote
data. This patch adds a clarifying comment to the pairing req/rsp
handlers when setting the LOCAL_OOB flag based on the PDU received from
the remote side.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/smp.c

index 82824213d0fbcebd0117ea2a340827c5086ba509..1bd281060de25578b4e7db9b7db6af9cc3715606 100644 (file)
@@ -1735,6 +1735,10 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)
        memcpy(&smp->preq[1], req, sizeof(*req));
        skb_pull(skb, sizeof(*req));
 
+       /* If the remote side's OOB flag is set it means it has
+        * successfully received our local OOB data - therefore set the
+        * flag to indicate that local OOB is in use.
+        */
        if (req->oob_flag == SMP_OOB_PRESENT)
                set_bit(SMP_FLAG_LOCAL_OOB, &smp->flags);
 
@@ -1902,6 +1906,10 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)
        if (hci_dev_test_flag(hdev, HCI_SC_ONLY) && !(auth & SMP_AUTH_SC))
                return SMP_AUTH_REQUIREMENTS;
 
+       /* If the remote side's OOB flag is set it means it has
+        * successfully received our local OOB data - therefore set the
+        * flag to indicate that local OOB is in use.
+        */
        if (rsp->oob_flag == SMP_OOB_PRESENT)
                set_bit(SMP_FLAG_LOCAL_OOB, &smp->flags);