FAILED: patch "[PATCH] Bluetooth: HCI: Set extended advertising data synchronously" failed to apply to 6.1-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 89fb8acc38852116d38d721ad394aad7f2871670
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025070626-clench-guts-9205@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 89fb8acc38852116d38d721ad394aad7f2871670 Mon Sep 17 00:00:00 2001
From: Christian Eggers <[email protected]>
Date: Fri, 27 Jun 2025 09:05:08 +0200
Subject: [PATCH] Bluetooth: HCI: Set extended advertising data synchronously
Currently, for controllers with extended advertising, the advertising data is set in the asynchronous response handler for extended adverstising params. As most advertising settings are performed in a synchronous context, the (asynchronous) setting of the advertising data is done too late (after enabling the advertising).
Move setting of adverstising data from asynchronous response handler into synchronous context to fix ordering of HCI commands.
v2: https://lore.kernel.org/linux-bluetooth/[email protected]/
net/bluetooth/hci_event.c +0 -36
@@ -2150,40 +2150,6 @@ static u8 hci_cc_set_adv_param(struct hci_dev *hdev, void *data,return rp->status; } -static u8 hci_cc_set_ext_adv_param (struct hci_dev *hdev,void *data, -struct sk_buff *skb) -{ -struct hci_rp_le_set_ext_adv_params *rp = data; -struct hci_cp_le_set_ext_adv_params *cp; -struct adv_info *adv_instance; - -bt_dev_dbg (hdev,"status 0x%2.2x" , rp->status); - -if (rp->status) -return rp->status; - - cp =hci_sent_cmd_data (hdev,HCI_OP_LE_SET_EXT_ADV_PARAMS ); -if (!cp) -return rp->status; - -hci_dev_lock (hdev); - hdev->adv_addr_type = cp->own_addr_type; -if (!cp->handle) { -/* Store in hdev for instance 0 */ - hdev->adv_tx_power = rp->tx_power; - }else { - adv_instance =hci_find_adv_instance (hdev, cp->handle); -if (adv_instance) - adv_instance->tx_power = rp->tx_power; - } -/* Update adv data as tx power is known now */ -hci_update_adv_data (hdev, cp->handle); - -hci_dev_unlock (hdev); - -return rp->status; -} -static u8 hci_cc_read_rssi (struct hci_dev *hdev,void *data,struct sk_buff *skb) {
@@ -4164,8 +4130,6 @@ static const struct hci_cc {HCI_CC (HCI_OP_LE_READ_NUM_SUPPORTED_ADV_SETS , hci_cc_le_read_num_adv_sets,sizeof (struct hci_rp_le_read_num_supported_adv_sets )), -HCI_CC (HCI_OP_LE_SET_EXT_ADV_PARAMS , hci_cc_set_ext_adv_param, -sizeof (struct hci_rp_le_set_ext_adv_params )),HCI_CC_STATUS (HCI_OP_LE_SET_EXT_ADV_ENABLE , hci_cc_le_set_ext_adv_enable), HCI_CC_STATUS(HCI_OP_LE_SET_ADV_SET_RAND_ADDR,
net/bluetooth/hci_sync.c +130 -77
240 lines not on this page · raw message
Sasha Levin
maintainerPATCH 1/1 Bluetooth: HCI: Set extended advertising data synchronously
From: Christian Eggers <[email protected]>
[ Upstream commit 89fb8acc38852116d38d721ad394aad7f2871670 ]
Currently, for controllers with extended advertising, the advertising data is set in the asynchronous response handler for extended adverstising params. As most advertising settings are performed in a synchronous context, the (asynchronous) setting of the advertising data is done too late (after enabling the advertising).
Move setting of adverstising data from asynchronous response handler into synchronous context to fix ordering of HCI commands.
v2: https://lore.kernel.org/linux-bluetooth/[email protected]/
--- net/bluetooth/hci_event.c | 36 ------- net/bluetooth/hci_sync.c | 213 ++++++++++++++++++++++++-------------- 2 files changed, 133 insertions(+), 116 deletions(-)
net/bluetooth/hci_event.c +0 -36
@@ -2196,40 +2196,6 @@ static u8 hci_cc_set_adv_param(struct hci_dev *hdev, void *data,return rp->status; } -static u8 hci_cc_set_ext_adv_param (struct hci_dev *hdev,void *data, -struct sk_buff *skb) -{ -struct hci_rp_le_set_ext_adv_params *rp = data; -struct hci_cp_le_set_ext_adv_params *cp; -struct adv_info *adv_instance; - -bt_dev_dbg (hdev,"status 0x%2.2x" , rp->status); - -if (rp->status) -return rp->status; - - cp =hci_sent_cmd_data (hdev,HCI_OP_LE_SET_EXT_ADV_PARAMS ); -if (!cp) -return rp->status; - -hci_dev_lock (hdev); - hdev->adv_addr_type = cp->own_addr_type; -if (!cp->handle) { -/* Store in hdev for instance 0 */ - hdev->adv_tx_power = rp->tx_power; - }else { - adv_instance =hci_find_adv_instance (hdev, cp->handle); -if (adv_instance) - adv_instance->tx_power = rp->tx_power; - } -/* Update adv data as tx power is known now */ -hci_update_adv_data (hdev, cp->handle); - -hci_dev_unlock (hdev); - -return rp->status; -} -static u8 hci_cc_read_rssi (struct hci_dev *hdev,void *data,struct sk_buff *skb) {
@@ -4172,8 +4138,6 @@ static const struct hci_cc {HCI_CC (HCI_OP_LE_READ_NUM_SUPPORTED_ADV_SETS , hci_cc_le_read_num_adv_sets,sizeof (struct hci_rp_le_read_num_supported_adv_sets )), -HCI_CC (HCI_OP_LE_SET_EXT_ADV_PARAMS , hci_cc_set_ext_adv_param, -sizeof (struct hci_rp_le_set_ext_adv_params )),HCI_CC_STATUS (HCI_OP_LE_SET_EXT_ADV_ENABLE , hci_cc_le_set_ext_adv_enable), HCI_CC_STATUS(HCI_OP_LE_SET_ADV_SET_RAND_ADDR,
net/bluetooth/hci_sync.c +133 -80
246 lines not on this page · raw message
Signature · 1 line
2.39.5