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

[Anders J. <and...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
l2cap.c         1.127           1.128=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* When retrasmitting info requests we should use the same ID.


The diff of the modified file(s):

--- l2cap.c	2002/01/06 17:33:04	1.127
+++ l2cap.c	2002/01/24 12:41:31	1.128
@@ -1959,7 +1959,7 @@
 		return;
 	}
=20
-	D_TIM(__FUNCTION__ ": current no rtx : %d\n", con->timer.rtx_no);
+	D_TIM(__FUNCTION__ ": current no rtx : %d\n", con->timers.rtx_no);
=20
 	con->timers.rtx.inuse =3D 0;
=20
@@ -2074,8 +2074,7 @@
=20
         /* Don't increment ID if retransmission */
         if (con->timers.rtx_no =3D=3D 0)
-                cmd->id =3D set_id(con); /* S
-ets sig_id_sent in l2cap_con */
+                cmd->id =3D set_id(con); /* Sets sig_id_sent in l2cap_con =
*/
         else
                 DSYS("RTX, use same ID\n");
=20
@@ -2303,7 +2302,12 @@
 		memcpy(req->data, opt_data, opt_len);
=20=20=20
 	cmd->code =3D SIG_ECHOREQ;
-	cmd->id =3D get_id();
+
+
+	if (con->timers.rtx_no =3D=3D 0)
+                cmd->id =3D set_id(con); /* Sets sig_id_sent in l2cap_con =
*/
+        else
+                DSYS("RTX, use same ID\n");
=20=20=20
 	cmd->len =3D cpu_to_le16(opt_len);
=20