Skip to contentSkip to conversation

Bluetooth: Avoid hard-coded IO capability values in SMP

PATCH In review [email protected] 2 participants 2 messages Sep 11, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Bluetooth: Avoid hard-coded IO capability values in SMP

From: Johan Hedberg <[email protected]>

This is a trivial change to use a proper define for the NoInputNoOutput IO capability instead of hard-coded values.

---
 net/bluetooth/smp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/bluetooth/smp.c +2 -2
index 3700dd8d9d0b..51fc7db2d84e 100644
@@ -959,7 +959,7 @@ 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 (conn->hcon->io_capability == 0x03)
+	if (conn->hcon->io_capability == HCI_IO_NO_INPUT_OUTPUT)
 		sec_level = BT_SECURITY_MEDIUM;
 	else
 		sec_level = authreq_to_seclevel(auth);
@@ -1169,7 +1169,7 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)
 
 	auth = rp->auth_req & AUTH_REQ_MASK;
 
-	if (hcon->io_capability == 0x03)
+	if (hcon->io_capability == HCI_IO_NO_INPUT_OUTPUT)
 		sec_level = BT_SECURITY_MEDIUM;
 	else
 		sec_level = authreq_to_seclevel(auth);
Signature · 1 line
1.9.3
maintainer
#1 lore raw

Hi Johan,

Quoted 7 lines

This is a trivial change to use a proper define for the NoInputNoOutput IO capability instead of hard-coded values.

---
net/bluetooth/smp.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel