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

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

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
rfcomm.c        1.111           1.112=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* always reset rfcomm con when receiving a disconnect ind.
* added debug message & minor cleanup


The diff of the modified file(s):

--- rfcomm.c	2001/05/23 15:17:55	1.111
+++ rfcomm.c	2001/05/29 13:14:11	1.112
@@ -577,6 +577,8 @@
 		return;
 	}
=20
+	D_CTRL(__FUNCTION__" line %d\n", line);
+
 	rfcomm_con_list[line].magic =3D RFCOMM_MAGIC;
 	rfcomm_con_list[line].line =3D line;
 	rfcomm_con_list[line].credit_flow =3D 0;
@@ -1027,9 +1029,10 @@
 		bt_unregister_rfcomm(rfcomm->line);
 #endif
 		bt_disconnect_ind(CREATE_RFCOMM_ID(rfcomm->line, 0));
-		rfcomm_reset_con(rfcomm->line);
 	}
=20=09
+	rfcomm_reset_con(rfcomm->line);
+
 	/* always try to send back rsp (if link is down con is deleted) */
 	if (l2ca_disconnect_rsp(l2cap)) {
 		D_ERR(__FUNCTION__" l2ca_disconnect_rsp failed\n");
@@ -2309,6 +2312,8 @@
 	msc_msg *msc_pkt;
 	u32 rfcomm_frame_size;
=20=20=20
+	D_CTRL(__FUNCTION__" val:%d, cr:%d, dlci:%d\n", value, cr, dlci);
+
 	rfcomm_frame_size =3D sizeof(msc_msg);
 	tx_buf =3D subscribe_bt_buf(sizeof(rfcomm_tx_buf) + rfcomm_frame_size);
=20