diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-16 15:11:44 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-16 15:11:44 -0400 |
commit | 08e6d907fe606b751adddce54ad8f51e0950bc3f (patch) | |
tree | 1a987f519b1ea706a61cd23d7eeea038dfe81b7a /net/bluetooth/hci_core.c | |
parent | d34c34fb2592bd5231a153ad1676c3ded175410a (diff) | |
parent | 671267bf3aac3dae0555730b07ef29c042e325b2 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r-- | net/bluetooth/hci_core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 83d3d3563bcc..a8962382f9c5 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -2715,6 +2715,14 @@ static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) | |||
2715 | if (conn) { | 2715 | if (conn) { |
2716 | hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF); | 2716 | hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF); |
2717 | 2717 | ||
2718 | hci_dev_lock(hdev); | ||
2719 | if (test_bit(HCI_MGMT, &hdev->dev_flags) && | ||
2720 | !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) | ||
2721 | mgmt_device_connected(hdev, &conn->dst, conn->type, | ||
2722 | conn->dst_type, 0, NULL, 0, | ||
2723 | conn->dev_class); | ||
2724 | hci_dev_unlock(hdev); | ||
2725 | |||
2718 | /* Send to upper protocol */ | 2726 | /* Send to upper protocol */ |
2719 | l2cap_recv_acldata(conn, skb, flags); | 2727 | l2cap_recv_acldata(conn, skb, flags); |
2720 | return; | 2728 | return; |