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

[Mattias A. <mat...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.136           1.137=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* added 1 s sleep in hci_emulator when connecting/disconnecting baseband
* fixed usermode stack declarations of "wait queues"


The diff of the modified file(s):

--- hci.c	2001/04/10 12:27:10	1.136
+++ hci.c	2001/04/12 15:13:01	1.137
@@ -304,7 +304,6 @@
 static u32 hci_cmd_pending =3D 0;
 static u32 hci_inq_pending =3D 0;
=20
-#if __KERNEL__
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 struct wait_queue *hci_wq =3D NULL;
 struct wait_queue *inq_wq =3D NULL;
@@ -316,7 +315,6 @@
 wait_queue_head_t set_baudrate_wq;
 wait_queue_head_t test_wq;
 #endif /* LINUX_VERSION_CODE */
-#endif /* __KERNEL__ */
=20
 static s32 test_wq_active =3D 0;
=20
@@ -3156,6 +3154,7 @@
 			D_CMD(__FUNCTION__", ACCEPT_CONNECTION->connection complete\n");
 			o_len =3D set_con_cpl_event(out_event, 0, cmd->data,
 						  HCI_HDL, ACL_CON);
+			sleep(1);
 			bt_write_lower_driver(o_event, o_len);
=20=20=20=20=20=20=20
 			lp_connect_cfm(data + 4, 0, 0);
@@ -3165,6 +3164,7 @@
 			D_CMD(__FUNCTION__", REJECT_CONNECTION->connection complete\n");
 			o_len =3D set_con_cpl_event(out_event, cmd->data[6],
 						  cmd->data, HCI_HDL, ACL_CON);
+			sleep(1);
 			bt_write_lower_driver(o_event, o_len);
 			lp_connect_cfm(data + 4, 0xd, 0);
 			break;