Bluetooth: Fix hci_le_conn_complete_evt

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=b9b343d25484bbceaee454ab422daafb1c5eda96
Commit:     b9b343d25484bbceaee454ab422daafb1c5eda96
Parent:     230fd16a2333fef9c012b054a127c7d157f7a7af
Author:     Andre Guedes <andre.guedes at openbossa.org>
AuthorDate: Fri Jul 27 15:10:11 2012 -0300
Committer:  Gustavo Padovan <gustavo.padovan at collabora.co.uk>
CommitDate: Mon Aug 6 15:05:10 2012 -0300

    Bluetooth: Fix hci_le_conn_complete_evt
    
    We need to check the 'Role' parameter from the LE Connection
    Complete Event in order to properly set 'out' and 'link_mode'
    fields from hci_conn structure.
    
    Signed-off-by: Andre Guedes <andre.guedes at openbossa.org>
    Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
---
 include/net/bluetooth/hci.h |    2 ++
 net/bluetooth/hci_event.c   |    5 +++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 7f19556..23cf413 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1304,6 +1304,8 @@ struct hci_ev_num_comp_blocks {
 } __packed;
 
 /* Low energy meta events */
+#define LE_CONN_ROLE_MASTER	0x00
+
 #define HCI_EV_LE_CONN_COMPLETE		0x01
 struct hci_ev_le_conn_complete {
 	__u8     status;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index e89d7f2..8b13ccc 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3368,6 +3368,11 @@ 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) {
+			conn->out = true;
+			conn->link_mode |= HCI_LM_MASTER;
+		}
 	}
 
 	if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))