CVS: The file 'linux/include/linux/bluetooth/btcommon.h' has been modified.

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

The following file was modified in linux/include/linux/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
btcommon.h      1.68            1.69=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

fixed blocking calls in usermode stack
added conf_req_sent in l2cap_con struct


The diff of the modified file(s):

--- btcommon.h	2001/04/10 12:26:41	1.68
+++ btcommon.h	2001/04/11 20:23:57	1.69
@@ -68,6 +68,7 @@
 /* KERNEL_VERSION() is not defined in all 2.0.x versions of the linux kern=
el.
    Define it here so we can use it in the code without having to check whe=
ther
    it is defined or not */
+
 #ifndef KERNEL_VERSION
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 #endif
@@ -75,8 +76,8 @@
 #ifndef __KERNEL__
 #define kmalloc(size,prio) malloc((size))
 #define kfree(obj) free((obj))
-#define wake_up_interruptible(p)
-#define interruptible_sleep_on(p) sleep(1)
+#define wake_up_interruptible(p) do {*(p) =3D 0;} while (0)
+#define interruptible_sleep_on(p) do {(int)*(p)=3D1; while (*(p)){ usleep(=
10000);}; } while (0)
 #define cli()
 #define sti()
 #endif
@@ -339,6 +340,7 @@
 	u8 sig_id_sent; /* last sent command id */
 	u8 sig_id_rcv; /* last received command id*/
=20=09
+	s32 conf_req_sent;
 	s32 conf_req_ready; /* indicates if we received pos rsp on our req */
 	s32 conf_rsp_ready; /* indicates if we replied pos on a config req */
=20