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

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

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
l2cap.c         1.89            1.90=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made user stack version compile without CONFIG_BLUETOOTH_L2CAP_USE_TIMERS.


The diff of the modified file(s):

--- l2cap.c	2001/03/05 15:52:52	1.89
+++ l2cap.c	2001/03/05 16:39:35	1.90
@@ -2768,6 +2768,7 @@
 }
=20
=20
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
 #ifdef __KERNEL__
 void
 l2cap_rtx_timeout(unsigned long ptr)
@@ -2808,7 +2809,6 @@
=20=20=20
   /* FIXME -- send l2ca_timeoutind() */
=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
   if (MAX_NO_RTX =3D=3D 0)
   {
 	  /* no retransmissions, shutdown connection */
@@ -2832,7 +2832,6 @@
 	  delete_con(con);
 	  return;
   }
-#endif
=20
   /* now resend command */
   switch(con->last_cmd.type) {
@@ -2917,7 +2916,7 @@
   timer_cancelled =3D 0;
 #endif
 }
-#endif
+#endif /* __KERNEL__ */
=20
 void
 disable_rtx(l2cap_con *con)
@@ -2931,7 +2930,6 @@
 #endif
 }
=20
-
 void
 l2cap_ertx_timeout(unsigned long ptr)
 {
@@ -2950,8 +2948,6 @@
 	/* if sending new request start RTX again */
=20
 	/* terminate for now */
-=09
-=09
 }
=20
 void
@@ -2965,8 +2961,7 @@
 {
   D_TIM("Disabling ERTX timer\n");
 }
-
-
+#endif /* CONFIG_BLUETOOTH_L2CAP_USE_TIMERS */
=20
 /***************************************************************/
 /*--------------------- MISCELLANEOUS ------------------------ */