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

[Mattias ?g. <mat...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
l2cap.c         1.83            1.84=20=20=20=20=20=20=20=20=20=20=20=20
l2cap_con.c     1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* fixed incorrect flow structure, used type/len in option data
* minor changes




The diff of the modified file(s):

--- l2cap.c	2001/02/27 15:00:16	1.83
+++ l2cap.c	2001/02/28 13:30:59	1.84
@@ -211,16 +211,16 @@
 protocol_layer* get_upper(u32 psm);
 void remove_all_upper(void);
=20
+#ifdef __KERNEL__
+static struct wait_queue *l2cap_disconnect_wq =3D NULL;
+#endif
+
 #ifdef L2CAP_USETIMERS
 #define MAX_NO_RTX 0
 #define RTX_TIMEOUT 5 /* sec */
 #define ERTX_TIMEOUT 60 /* sec */
=20
 #ifdef __KERNEL__
-static struct wait_queue *l2cap_disconnect_wq =3D NULL;
-#endif
-
-#ifdef __KERNEL__
 void start_rtx(l2cap_con *con, unsigned short timeout);
 void disable_rtx(l2cap_con *con);
 void start_ertx(l2cap_con *con, unsigned short timeout);
@@ -2789,6 +2789,7 @@
=20=20=20
   /* FIXME -- send l2ca_timeoutind() */
=20
+#ifdef L2CAP_USETIMERS
   if (MAX_NO_RTX =3D=3D 0)
   {
 	  /* no retransmissions, shutdown connection */
@@ -2812,6 +2813,7 @@
 	  delete_con(con);
 	  return;
   }
+#endif
=20
   /* now resend command */
   switch(con->last_cmd.type) {
@@ -3103,7 +3105,6 @@
=20
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -=
 - */
=20
-
 void=20
 print_flow(flow *f)
 {
@@ -3115,8 +3116,8 @@
 	} else {
=20=09=09
 		printk("flow:\n");
-		printk("type:%d flags:%d service:%d token_rate:%d\n",
-		       f->type, f->flags, f->service, (int) f->token_rate);
+		printk("flags:%d service:%d token_rate:%d\n",
+		       f->flags, f->service, (int) f->token_rate);
 		printk("bucket_size:%d bytes peak:%d bps latency:%d ms delay:%d ms\n",
 		       (int)f->bucket_size, (int)f->peak, (int)f->latency,=20
 		       (int)f->delay);
--- l2cap_con.c	2001/02/15 16:27:33	1.3
+++ l2cap_con.c	2001/02/28 13:31:00	1.4
@@ -559,8 +559,6 @@
 init_flow(flow *f)
 {
 	D_MISC("init_flow\n");
-	f->type =3D 0x3;
-	f->len =3D 22;
 	f->flags =3D 0;
 	f->service =3D 0x01;
 	f->token_rate =3D 0x00000000; /* No token rate specified, default */