diff options
| author | Andrei Emeltchenko | 2012-05-24 14:42:50 +0200 |
|---|---|---|
| committer | Johan Hedberg | 2012-06-05 05:34:09 +0200 |
| commit | 2983fd682444180e45567ce8147a612b97ba69da (patch) | |
| tree | 57ebc25eb8b0cc854256b50476276b9cb4515ce6 /net/bluetooth/l2cap_core.c | |
| parent | Bluetooth: Use lmp_ssp_capable() macro (diff) | |
| download | kernel-qcow2-linux-2983fd682444180e45567ce8147a612b97ba69da.tar.gz kernel-qcow2-linux-2983fd682444180e45567ce8147a612b97ba69da.tar.xz kernel-qcow2-linux-2983fd682444180e45567ce8147a612b97ba69da.zip | |
Bluetooth: Define and use PSM identifiers
Define assigned Protocol and Service Multiplexor (PSM) identifiers
and use them instead of magic numbers.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index c9e6ae4a3363..65c3f4e13965 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -648,7 +648,7 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan) default: return HCI_AT_NO_BONDING; } - } else if (chan->psm == cpu_to_le16(0x0001)) { + } else if (chan->psm == __constant_cpu_to_le16(L2CAP_PSM_SDP)) { if (chan->sec_level == BT_SECURITY_LOW) chan->sec_level = BT_SECURITY_SDP; @@ -3393,7 +3393,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd lock_sock(parent); /* Check if the ACL is secure enough (if not SDP) */ - if (psm != cpu_to_le16(0x0001) && + if (psm != __constant_cpu_to_le16(L2CAP_PSM_SDP) && !hci_conn_check_link_mode(conn->hcon)) { conn->disc_reason = HCI_ERROR_AUTH_FAILURE; result = L2CAP_CR_SEC_BLOCK; |