Bluetooth: Convert MSFT filter HCI cmd to hci_sync
Subsystems (2)
PATCH v2 1/1 Bluetooth: Convert MSFT filter HCI cmd to hci_sync
The msft_set_filter_enable() command was using the deprecated hci_request mechanism rather than hci_sync. This caused the warning error:
hci0: HCI_REQ-0xfcf0
Signed-off-by Brian Gix <[email protected]>
--- net/bluetooth/msft.c | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-)
net/bluetooth/msft.c +11 -25
@@ -743,17 +743,12 @@ __u64 msft_get_features(struct hci_dev *hdev) }static void msft_le_set_advertisement_filter_enable_cb (struct hci_dev *hdev, -u8 status,u16 opcode, -struct sk_buff *skb) +void *user_data, +u8 status) { -struct msft_cp_le_set_advertisement_filter_enable *cp; -struct msft_rp_le_set_advertisement_filter_enable *rp; +struct msft_cp_le_set_advertisement_filter_enable *cp = user_data;struct msft_data *msft = hdev->msft_data; - rp = (struct msft_rp_le_set_advertisement_filter_enable *)skb->data; -if (skb->len <sizeof (*rp)) -return ; -/* Error 0x0C would be returned if the filter enabled status is * already set to whatever we were trying to set. * Although the default state should be disabled, some controller set
@@ -766,7 +761,6 @@ static void msft_le_set_advertisement_filter_enable_cb(struct hci_dev *hdev,hci_dev_lock (hdev); - cp =hci_sent_cmd_data (hdev, hdev->msft_opcode); msft->filter_enabled = cp->enable;if (status ==0x0C )
@@ -804,31 +798,23 @@ int msft_remove_monitor(struct hci_dev *hdev, struct adv_monitor *monitor)return msft_remove_monitor_sync (hdev, monitor); } -void msft_req_add_set_filter_enable (struct hci_request *req,bool enable) -{ -struct hci_dev *hdev = req->hdev; -struct msft_cp_le_set_advertisement_filter_enable cp; - - cp.sub_opcode =MSFT_OP_LE_SET_ADVERTISEMENT_FILTER_ENABLE ; - cp.enable = enable; - -hci_req_add (req, hdev->msft_opcode,sizeof (cp), &cp); -} -int msft_set_filter_enable (struct hci_dev *hdev,bool enable) { -struct hci_request req; +struct msft_cp_le_set_advertisement_filter_enable cp;struct msft_data *msft = hdev->msft_data;int err;if (!msft)return -EOPNOTSUPP ; -hci_req_init (&req, hdev); -msft_req_add_set_filter_enable (&req, enable); - err =hci_req_run_skb (&req, msft_le_set_advertisement_filter_enable_cb); + cp.sub_opcode =MSFT_OP_LE_SET_ADVERTISEMENT_FILTER_ENABLE ; + cp.enable = enable; + err =__hci_cmd_sync_status (hdev, hdev->msft_opcode,sizeof (cp), &cp, +HCI_CMD_TIMEOUT ); + +msft_le_set_advertisement_filter_enable_cb (hdev, &cp, err); -return err; +return 0 ; }bool msft_curve_validity (struct hci_dev *hdev)
Signature · 1 line
2.39.2
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Fri, 24 Feb 2023 09:56:32 -0800 you wrote:
The
msft_set_filter_enable()command was using the deprecatedhci_requestmechanism rather thanhci_sync. This caused the warning error:
hci0: HCI_REQ-0xfcf0Signed-off-by Brian Gix <[email protected]>--- net/bluetooth/msft.c | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-)
Here is the summary with links:
- [v2] Bluetooth: Convert MSFT filter HCI cmd to hci_sync
https://git.kernel.org/bluetooth/bluetooth-next/c/0e21956501c0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html