Skip to contentSkip to conversation

Bluetooth: Send new settings event when changing high speed option

PATCH Applied Marcel Holtmann 2 participants 3 messages Oct 1, 2013 – Oct 2, 2013

Subsystems (2)
lore
Share & tools
lore

Marcel Holtmann

author maintainer
#0 lore raw

PATCH 1/1 Bluetooth: Send new settings event when changing high speed option

When enabling or disabling high speed setting it is required to send a new settings event to inform other management interface users about the changed settings.

---
 net/bluetooth/mgmt.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
net/bluetooth/mgmt.c +16 -3
index 1b5b10f..13b5435 100644
@@ -1341,6 +1341,8 @@ failed:
 static int set_hs(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
 {
 	struct mgmt_mode *cp = data;
+	bool changed;
+	int err;
 
 	BT_DBG("request for %s", hdev->name);
 
@@ -1352,12 +1354,23 @@ static int set_hs(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
 		return cmd_status(sk, hdev->id, MGMT_OP_SET_HS,
 				  MGMT_STATUS_INVALID_PARAMS);
 
+	hci_dev_lock(hdev);
+
 	if (cp->val)
-		set_bit(HCI_HS_ENABLED, &hdev->dev_flags);
+		changed = !test_and_set_bit(HCI_HS_ENABLED, &hdev->dev_flags);
 	else
-		clear_bit(HCI_HS_ENABLED, &hdev->dev_flags);
+		changed = test_and_clear_bit(HCI_HS_ENABLED, &hdev->dev_flags);
+
+	err = send_settings_rsp(sk, MGMT_OP_SET_HS, hdev);
+	if (err < 0)
+		goto unlock;
 
-	return send_settings_rsp(sk, MGMT_OP_SET_HS, hdev);
+	if (changed)
+		err = new_settings(hdev, sk);
+
+unlock:
+	hci_dev_unlock(hdev);
+	return err;
 }
 
 static void le_enable_complete(struct hci_dev *hdev, u8 status)
Signature · 1 line
1.8.3.1
Acked-by on v1 1/1
#1 lore raw

Hi Marcel,

Quoted 8 lines · Marcel Holtmann

When enabling or disabling high speed setting it is required to send a new settings event to inform other management interface users about the changed settings.

---
 net/bluetooth/mgmt.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

Johan

#2 lore raw

Hi Marcel,

Quoted 11 lines · Johan Hedberg
Quoted 8 lines · Marcel Holtmann

When enabling or disabling high speed setting it is required to send a new settings event to inform other management interface users about the changed settings.

---
 net/bluetooth/mgmt.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

Applied to bluetooth-next. Thanks.

Johan