CVS: 2 files have been modified in linux/drivers/char/bluetooth.

[Lena H. <le...@us...>]

The following files were modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
bcsp.c          1.14            1.15=20=20=20=20=20=20=20=20=20=20=20=20
hci_vendor.c    1.46            1.47=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made it compile for linux 2.4.x

The diff of the modified file(s):

--- bcsp.c	2001/06/13 12:11:53	1.14
+++ bcsp.c	2001/06/20 13:46:07	1.15
@@ -90,7 +90,11 @@
 /****************** LOCAL VARIABLE DECLARATION SECTION *******************=
***/
=20
 static struct timer_list bcsp_sync_timer;
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
+static wait_queue_head_t bcsp_sync_wq;
+#else
 static struct wait_queue *bcsp_sync_wq =3D NULL;
+#endif
 static u32 bcsp_sync =3D FALSE;
=20
 /****************** FUNCTION DEFINITION SECTION **************************=
***/
@@ -123,6 +127,10 @@
 {
 	DSYS("Initializing BCSP\n");
=20=09
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
+	init_waitqueue_head(&bcsp_sync_wq);
+#endif
+
 	bcsp_datagram_init();
 	bcsp_sequence_init();
=20=09
--- hci_vendor.c	2001/06/15 13:39:08	1.46
+++ hci_vendor.c	2001/06/20 13:46:07	1.47
@@ -691,10 +691,14 @@
 	/* wait for command status */
 	while (hci_ctrl.hc_buf.cmd_num =3D=3D 0)
 	{
-		current->timeout =3D HZ/100;
 		current->state =3D TASK_INTERRUPTIBLE;
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,2,0)
+		schedule_timeout(HZ/100);
+#else
+		current->timeout =3D HZ/100;
 		schedule();
 		current->timeout =3D 0;
+#endif
 	}
 }
=20