[BlueZ] gatt: added missing disconn_id's and removed extra check

[BlueZ] gatt: added missing disconn_id's and removed extra check

[Bernie Conrad]

From: Bernie Conrad <bernie@allthenticate.com>

Adds missing assignment to disconn_id for pending operations and removes
check that is already handled by checking if the owner_queue of the op
is gone at the start of write_reply_cb. 

---
 src/gatt-database.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gatt-database.c b/src/gatt-database.c
index 475e7873c..dbe9415a3 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -978,7 +978,7 @@ static struct pending_op *pending_ccc_new(struct bt_att *att,
 	op->attrib = attrib;
 	op->link_type = link_type;
 
-	bt_att_register_disconnect(att,
+	op->disconn_id = bt_att_register_disconnect(att,
 				   pending_disconnect_cb,
 				   op,
 				   NULL);
@@ -2387,9 +2387,7 @@ static void write_reply_cb(DBusMessage *message, void *user_data)
 	}
 
 done:
-	/* Make sure that only reply if the device is connected */
-	if (!bt_att_get_fd(op->att))
-		gatt_db_attribute_write_result(op->attrib, op->id, ecode);
+	gatt_db_attribute_write_result(op->attrib, op->id, ecode);
 }
 
 static struct pending_op *pending_write_new(struct bt_att *att,
@@ -2418,7 +2416,7 @@ static struct pending_op *pending_write_new(struct bt_att *att,
 	op->prep_authorize = prep_authorize;
 	queue_push_tail(owner_queue, op);
 
-	bt_att_register_disconnect(att,
+	op->disconn_id = bt_att_register_disconnect(att,
 			    pending_disconnect_cb,
 			    op, NULL);
 
-- 
2.17.1

RE: [BlueZ] gatt: added missing disconn_id's and removed extra check

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 1138 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=562169

---Test result---

Test Summary:
CheckPatch                    PASS      1.65 seconds
GitLint                       FAIL      0.92 seconds
Prep - Setup ELL              PASS      41.66 seconds
Build - Prep                  PASS      0.47 seconds
Build - Configure             PASS      7.42 seconds
Build - Make                  PASS      172.66 seconds
Make Check                    PASS      9.43 seconds
Make Distcheck                PASS      207.02 seconds
Build w/ext ELL - Configure   PASS      7.64 seconds
Build w/ext ELL - Make        PASS      163.95 seconds

Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint with rule in .gitlint
Output:
[BlueZ] gatt: added missing disconn_id's and removed extra check
7: B2 Line has trailing whitespace: "is gone at the start of write_reply_cb. "




---
Regards,
Linux Bluetooth