diff options
| author | Johan Hedberg | 2014-07-09 18:18:11 +0200 |
|---|---|---|
| committer | Marcel Holtmann | 2014-07-09 18:23:06 +0200 |
| commit | c072d546c20390fea0e5332d00fd1b67366ca013 (patch) | |
| tree | 75a1ac41740b8d151cc18757f2496ada4f0534f4 /net/bluetooth | |
| parent | Bluetooth: Fix forcing SMP just-works with no-bonding (diff) | |
| download | kernel-qcow2-linux-c072d546c20390fea0e5332d00fd1b67366ca013.tar.gz kernel-qcow2-linux-c072d546c20390fea0e5332d00fd1b67366ca013.tar.xz kernel-qcow2-linux-c072d546c20390fea0e5332d00fd1b67366ca013.zip | |
Bluetooth: Fix incorrect clearing of SMP_FLAG_INITIATOR
When the SMP context is created all flags default to zero. To determine
that we are the initiators it's therefore best to simply change the flag
value when we know we're sending the first SMP PDU. Clearing the flag
when receiving a Pairing Request is not correct since the request may be
a response to a previous Security Request from us (for which we would
already have correctly set the flag). Same goes for receiving a Security
Request which may be coming after us already starting pairing by sending
a Pairing Request.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/smp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index a5e51c686469..627d683203cf 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -735,8 +735,6 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb) if (ret) return SMP_UNSPECIFIED; - clear_bit(SMP_FLAG_INITIATOR, &smp->flags); - return 0; } @@ -927,8 +925,6 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb) smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &cp); - clear_bit(SMP_FLAG_INITIATOR, &smp->flags); - return 0; } |