summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-16 11:42:26 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-07-16 11:04:23 +0200
commitba165a90b59812ab1d9cd2943fd104cfc25c601e (patch)
treecf72d266592846f235daac9f53643e390e00ad94 /net/bluetooth
parent2d3c2260e7ef0b21f7f0db0fbfee0b092e1202f8 (diff)
downloadop-kernel-dev-ba165a90b59812ab1d9cd2943fd104cfc25c601e.zip
op-kernel-dev-ba165a90b59812ab1d9cd2943fd104cfc25c601e.tar.gz
Bluetooth: Add proper defines for HCI connection role
All HCI commands and events, including LE ones, use 0x00 for master role and 0x01 for slave role. It makes therefore sense to add generic defines for these instead of the current LE_CONN_ROLE_MASTER. Having clean defines will also make it possible to provide simpler internal APIs. 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/hci_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 68d335e..13f83c4 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4116,7 +4116,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
conn->dst_type = ev->bdaddr_type;
- if (ev->role == LE_CONN_ROLE_MASTER) {
+ if (ev->role == HCI_ROLE_MASTER) {
conn->out = true;
set_bit(HCI_CONN_MASTER, &conn->flags);
}
OpenPOWER on IntegriCloud