CVS: The file 'linux/drivers/char/bluetooth/hci.c' has been modified.

[Gordon M. <gm...@us...>]

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.132.2.2       1.132.2.3=20=20=20=20=20=20=20

The accompanying log:

--Reversed the bytes in the GIAC and LIAC.
--Extended the Inquiry timer to 40 seconds.


The diff of the modified file(s):

--- hci.c	2001/03/20 20:12:35	1.132.2.2
+++ hci.c	2001/03/21 23:23:25	1.132.2.3
@@ -831,9 +831,10 @@
 #ifdef CONFIG_BLUETOOTH_HCI_INQUIRY  /************************************=
***/
 // Adds about 1k
=20
-// See [BSC] Appendix VIII 1.1
-static const u8 GIAC[] =3D { 0x9e, 0x8b, 0x33 };
-static const u8 LIAC[] =3D { 0x9e, 0x8b, 0x00 };
+// See [BSC] Appendix VIII 1.1. Note that these must be reversed from that
+// shown in the Spec. Why?
+static const u8 GIAC[] =3D { 0x33, 0x8b, 0x9e };
+static const u8 LIAC[] =3D { 0x00, 0x8b, 0x9e };
=20
 static struct inquiry_results *pending_inq_res =3D NULL;
 static u32 hci_inq_pending =3D 0;
@@ -861,7 +862,7 @@
 	init_timer(&hci_inq_timer);
 	hci_inq_timer.function =3D inq_timeout;
 	hci_inq_timer.data =3D 0;
-	hci_inq_timer.expires =3D jiffies + 10*HZ;
+	hci_inq_timer.expires =3D jiffies + 40*HZ;
 	add_timer(&hci_inq_timer);
 }
 static void release_inq_timer(void)
@@ -922,6 +923,8 @@
 #endif
=20
 	D_CMD(__FUNCTION__ "\n");
+
+	PRINTPKT("LAP:", lap, 3);
=20
 	// Check for a valid LAP.
 	if (!memcmp(lap, GIAC, 3) && !memcmp(lap, LIAC, 3))