diff options
author | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:17:02 -0500 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:17:02 -0500 |
commit | d954896edb658cf72dd069d92b5235c06521ffab (patch) | |
tree | fe8b798176191c681c6b2fa1c81aa55dc98568dc /net/bluetooth/hci_core.c | |
parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
parent | 12ad10004645d38356b14d1fbba379c523a61916 (diff) |
Merge branch 'timers/for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-rmk/broadcast
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r-- | net/bluetooth/hci_core.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 596660d37c5e..0f78e34220c9 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -2810,14 +2810,6 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) | |||
2810 | if (conn) { | 2810 | if (conn) { |
2811 | hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF); | 2811 | hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF); |
2812 | 2812 | ||
2813 | hci_dev_lock(hdev); | ||
2814 | if (test_bit(HCI_MGMT, &hdev->dev_flags) && | ||
2815 | !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) | ||
2816 | mgmt_device_connected(hdev, &conn->dst, conn->type, | ||
2817 | conn->dst_type, 0, NULL, 0, | ||
2818 | conn->dev_class); | ||
2819 | hci_dev_unlock(hdev); | ||
2820 | |||
2821 | /* Send to upper protocol */ | 2813 | /* Send to upper protocol */ |
2822 | l2cap_recv_acldata(conn, skb, flags); | 2814 | l2cap_recv_acldata(conn, skb, flags); |
2823 | return; | 2815 | return; |