Commit e707e366 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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/20241112175326.930800-1-luiz.dentz@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 20bbe5b8 d5359a7f

drivers/bluetooth/btintel.c

+2 −3
Original line number Diff line number Diff line
@@ -3288,13 +3288,12 @@ static int btintel_diagnostics(struct hci_dev *hdev, struct sk_buff *skb) 
	case INTEL_TLV_TEST_EXCEPTION:

		/* Generate devcoredump from exception */

		if (!hci_devcd_init(hdev, skb->len)) {

			hci_devcd_append(hdev, skb);

			hci_devcd_append(hdev, skb_clone(skb, GFP_ATOMIC));

			hci_devcd_complete(hdev);

		} else {

			bt_dev_err(hdev, "Failed to generate devcoredump");

			kfree_skb(skb);

		}

		return 0;

	break;

	default:

		bt_dev_err(hdev, "Invalid exception type %02X", tlv->val[0]);

	}

net/bluetooth/hci_core.c

+0 −2
Original line number Diff line number Diff line
@@ -3788,8 +3788,6 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) 


	hci_dev_lock(hdev);

	conn = hci_conn_hash_lookup_handle(hdev, handle);

	if (conn && hci_dev_test_flag(hdev, HCI_MGMT))

		mgmt_device_connected(hdev, conn, NULL, 0);

	hci_dev_unlock(hdev);



	if (conn) {