OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aeaeb4b
)
Bluetooth: Avoid hard-coded IO capability values in SMP
author
Johan Hedberg
<johan.hedberg@intel.com>
Thu, 11 Sep 2014 00:58:54 +0000
(17:58 -0700)
committer
Marcel Holtmann
<marcel@holtmann.org>
Thu, 11 Sep 2014 01:02:22 +0000
(
03:02
+0200)
This is a trivial change to use a proper define for the NoInputNoOutput
IO capability instead of hard-coded values.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/smp.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/smp.c
b/net/bluetooth/smp.c
index
3700dd8
..
51fc7db
100644
(file)
--- a/
net/bluetooth/smp.c
+++ b/
net/bluetooth/smp.c
@@
-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);