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

[Peter K. <pk...@us...>]

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

Name        Old version  New version  Tag  Comment
----        -----------  -----------  ---  -------
btcommon.h  1.96         1.97=20=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made the user stack compile again (I am pretty sure it does not
work, but at least it compiles).


The diff of the modified file(s):

--- btcommon.h	6 Aug 2002 17:53:30 -0000	1.96
+++ btcommon.h	27 Sep 2002 12:54:12 -0000	1.97
@@ -358,16 +358,9 @@
=20
 typedef struct l2cap_timer_obj
 {
-#ifdef __KERNEL__
 	struct bt_timer_obj rtx;
 	struct bt_timer_obj ertx;
 	struct bt_timer_obj crtx; /* Maximum negotiation time 120 sec */
-#else
-	/* dummy */
-	int rtx;
-	int ertx;
-	int crtx; /* Maximum negotiation time 120 sec */
-#endif
 	u16 rtx_no; /* nbr retries */
 } __attribute__ ((packed)) l2cap_timer_obj;
=20