Re: [Bluez-devel] Prepare patch bluez for the CoD in hci_conn

[Marcel Holtmann <marcel@holtmann.org>]

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

Hi Chen,

> The attachment is my patch, the comments and the debug info can be
> removed as soon as this patch is tested fully.

and your patch is quite too complex. Mine consists of three additional
lines only.

Regards

Marcel


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

===== include/net/bluetooth/hci_core.h 1.29 vs edited =====
--- 1.29/include/net/bluetooth/hci_core.h	2004-12-06 09:15:52 +01:00
+++ edited/include/net/bluetooth/hci_core.h	2004-12-06 09:26:59 +01:00
@@ -152,6 +152,7 @@
 	__u16		 state;
 	__u8		 type;
 	__u8		 out;
+	__u8		 dev_class[3];
 	__u32		 link_mode;
 	unsigned long	 pend;
 	
===== net/bluetooth/hci_conn.c 1.18 vs edited =====
--- 1.18/net/bluetooth/hci_conn.c	2004-12-06 09:16:18 +01:00
+++ edited/net/bluetooth/hci_conn.c	2004-12-06 09:38:53 +01:00
@@ -74,6 +74,7 @@
 		cp.pscan_rep_mode = ie->data.pscan_rep_mode;
 		cp.pscan_mode     = ie->data.pscan_mode;
 		cp.clock_offset   = ie->data.clock_offset | __cpu_to_le16(0x8000);
+		memcpy(conn->dev_class, ie->data.dev_class, 3);
 	}
 
 	cp.pkt_type = __cpu_to_le16(hdev->pkt_type & ACL_PTYPE_MASK);
===== net/bluetooth/hci_event.c 1.20 vs edited =====
--- 1.20/net/bluetooth/hci_event.c	2004-12-06 09:16:20 +01:00
+++ edited/net/bluetooth/hci_event.c	2004-12-06 09:29:36 +01:00
@@ -555,6 +555,7 @@
 				return;
 			}
 		}
+		memcpy(conn->dev_class, ev->dev_class, 3);
 		conn->state = BT_CONNECT;
 		hci_dev_unlock(hdev);