Bluetooth: Remove bogus check for pending mgmt Set HS command
Subsystems (2)
PATCH v2 1/2 Bluetooth: Remove bogus check for pending mgmt Set HS command
From: Johan Hedberg <[email protected]>
The command handler for Set HS doesn't use mgmt_pending_add() so we can never have a pending Set HS command that mgmt_pending_find() would return. This patch removes an unnecessary lookup for it in the set_ssp() handler function.
--- net/bluetooth/mgmt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/bluetooth/mgmt.c +1 -2
@@ -2116,8 +2116,7 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) goto failed; } -if (mgmt_pending_find (MGMT_OP_SET_SSP , hdev) || -mgmt_pending_find (MGMT_OP_SET_HS , hdev)) { +if (mgmt_pending_find (MGMT_OP_SET_SSP , hdev)) { err =cmd_status (sk, hdev->id,MGMT_OP_SET_SSP ,MGMT_STATUS_BUSY ); goto failed;
Signature · 1 line
2.1.0
PATCH v2 2/2 Bluetooth: Fix checking for pending Set SSP in Set HS handler
From: Johan Hedberg <[email protected]>
Changing the HS setting requires that SSP is enabled, however so far the code only checked for the SSP flag but not a potentially ongoing Set SSP operation. This patch adds a check for a pending Set SSP command in the Set HS handler, and returns a 'busy' error if one is found.
--- net/bluetooth/mgmt.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/bluetooth/mgmt.c +6 -0
@@ -2175,6 +2175,12 @@ static int set_hs(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)hci_dev_lock (hdev); +if (mgmt_pending_find (MGMT_OP_SET_SSP , hdev)) { + err =cmd_status (sk, hdev->id,MGMT_OP_SET_HS , +MGMT_STATUS_BUSY ); + goto unlock; + } +if (cp->val) { changed = !test_and_set_bit (HCI_HS_ENABLED , &hdev->dev_flags); }else {
Signature · 1 line
2.1.0
Marcel Holtmann
maintainerRe: [PATCH v2 2/2] Bluetooth: Fix checking for pending Set SSP in Set HS handler
Hi Johan,
Quoted 9 lines
Changing the HS setting requires that SSP is enabled, however so far the code only checked for the SSP flag but not a potentially ongoing Set SSP operation. This patch adds a check for a pending Set SSP command in the Set HS handler, and returns a 'busy' error if one is found.
Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/mgmt.c| 6 ++++++1 file changed, 6 insertions(+)
patch has been applied to bluetooth-next tree.
Regards
Marcel
Marcel Holtmann
maintainerHi Johan,
Quoted 9 lines
The command handler for Set HS doesn't use
mgmt_pending_add()so we can never have a pending Set HS command thatmgmt_pending_find()would return. This patch removes an unnecessary lookup for it in theset_ssp()handler function.Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/mgmt.c| 3 +--1 file changed, 1 insertion(+), 2 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel