Skip to content

Commit e707e36

Browse files
committed
Merge tag 'for-net-2024-11-12' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Luiz Augusto von Dentz says: ==================== bluetooth pull request for net: - btintel: Direct exception event to bluetooth stack - hci_core: Fix calling mgmt_device_connected * tag 'for-net-2024-11-12' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth: Bluetooth: btintel: Direct exception event to bluetooth stack Bluetooth: hci_core: Fix calling mgmt_device_connected ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 20bbe5b + d5359a7 commit e707e36

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

drivers/bluetooth/btintel.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3288,13 +3288,12 @@ static int btintel_diagnostics(struct hci_dev *hdev, struct sk_buff *skb)
32883288
case INTEL_TLV_TEST_EXCEPTION:
32893289
/* Generate devcoredump from exception */
32903290
if (!hci_devcd_init(hdev, skb->len)) {
3291-
hci_devcd_append(hdev, skb);
3291+
hci_devcd_append(hdev, skb_clone(skb, GFP_ATOMIC));
32923292
hci_devcd_complete(hdev);
32933293
} else {
32943294
bt_dev_err(hdev, "Failed to generate devcoredump");
3295-
kfree_skb(skb);
32963295
}
3297-
return 0;
3296+
break;
32983297
default:
32993298
bt_dev_err(hdev, "Invalid exception type %02X", tlv->val[0]);
33003299
}

net/bluetooth/hci_core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3788,8 +3788,6 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
37883788

37893789
hci_dev_lock(hdev);
37903790
conn = hci_conn_hash_lookup_handle(hdev, handle);
3791-
if (conn && hci_dev_test_flag(hdev, HCI_MGMT))
3792-
mgmt_device_connected(hdev, conn, NULL, 0);
37933791
hci_dev_unlock(hdev);
37943792

37953793
if (conn) {

0 commit comments

Comments
 (0)