Diff between 13d5e9c49bbcd1b3f3ece84f5de5c7bbd47e2699 and 3204c443ad57452102783b0fadd682c429e25a1a

Changed Files

File Additions Deletions Status
emulator/btdev.c +11 -14 modified

Full Patch

diff --git a/emulator/btdev.c b/emulator/btdev.c
index 5f04bd1..7b40699 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -833,20 +833,17 @@ static void conn_request(struct btdev *btdev, const uint8_t *bdaddr)
 {
 	struct btdev *remote = find_btdev_by_bdaddr(bdaddr);
 
-	if (remote) {
-		if (remote->scan_enable & 0x02) {
-			struct bt_hci_evt_conn_request cr;
-
-			memcpy(cr.bdaddr, btdev->bdaddr, 6);
-			memcpy(cr.dev_class, btdev->dev_class, 3);
-			cr.link_type = 0x01;
-
-			send_event(remote, BT_HCI_EVT_CONN_REQUEST,
-							&cr, sizeof(cr));
-		} else
-			conn_complete(btdev, bdaddr, BT_HCI_ERR_PAGE_TIMEOUT);
-	} else
-		conn_complete(btdev, bdaddr, BT_HCI_ERR_UNKNOWN_CONN_ID);
+	if (remote && remote->scan_enable & 0x02) {
+		struct bt_hci_evt_conn_request cr;
+
+		memcpy(cr.bdaddr, btdev->bdaddr, 6);
+		memcpy(cr.dev_class, btdev->dev_class, 3);
+		cr.link_type = 0x01;
+
+		send_event(remote, BT_HCI_EVT_CONN_REQUEST, &cr, sizeof(cr));
+	} else {
+		conn_complete(btdev, bdaddr, BT_HCI_ERR_PAGE_TIMEOUT);
+	}
 }
 
 static void disconnect_complete(struct btdev *btdev, uint16_t handle,