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.117           1.118=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* call bt_unregister_rfcomm when a data channel is disconnected
* changed some debug



The diff of the modified file(s):

--- rfcomm.c	2001/08/02 15:45:15	1.117
+++ rfcomm.c	2001/08/02 16:03:28	1.118
@@ -818,7 +818,7 @@
 		/* check control channel */
 		if (rfcomm->dlci[0].state !=3D DISCONNECTED)
 		{
-			printk("Rfcomm disconnect failed, reset session\n");
+			D_ERR("Rfcomm disconnect failed, reset session\n");
 #ifdef __KERNEL__=09=09=09
 			bt_unregister_rfcomm(rfcomm->line);
 			bt_disconnect_cfm(CREATE_RFCOMM_ID(rfcomm->line, 0),=20
@@ -1261,17 +1261,18 @@
 		} else if ((short_pkt->h.addr.server_chn) =3D=3D 0) {
 			rfcomm->dlci[0].state =3D DISCONNECTED;
=20
-			printk("RFCOMM control ch disconnected (remotely)\n");
+			DSYS("RFCOMM control ch disconnected (remotely) [line:%d]\n",=20
+			       rfcomm->line);
 			send_ua(rfcomm, 0);
-#ifdef __KERNEL__
-			bt_unregister_rfcomm(rfcomm->line);
-#endif
 		} else {
 			rfcomm->dlci[tmp_dlci].state =3D DISCONNECTED;
 			send_ua(rfcomm, tmp_dlci);
 			D_CTRL("dlci %d was disconnected\n", tmp_dlci);
 			bt_disconnect_ind(CREATE_RFCOMM_ID(rfcomm->line,=20
 							   tmp_dlci));
+#ifdef __KERNEL__
+			bt_unregister_rfcomm(rfcomm->line);
+#endif
 		}
 		break;
=20=20=20=20=20
@@ -1661,7 +1662,7 @@
 			rfcomm->dlci[tmp_dlci].mtu  =3D pn_pkt->frame_size;
=20=09=09=09
 			if (pn_pkt->credit_flow =3D=3D 0xe) {
-				printk(FNC"Credit flow control used\n");
+				DSYS(FNC"Credit flow control used\n");
 				rfcomm->credit_flow =3D TRUE;
 				rfcomm->dlci[tmp_dlci].local_credits =3D pn_pkt->credits;
 				D_CTRL(FNC"Local credits:%d\n", rfcomm->dlci[tmp_dlci].local_credits);=
=20
@@ -2624,7 +2625,7 @@
 rfcomm_pn_msg(rfcomm_con *rfcomm, u8 dlci, u8 credits, u32 frame_size)
 {
 	if (credits) {
-		printk(FNC"using %d credits\n", credits);
+		DSYS(FNC"using %d credits\n", credits);
 		return send_pn_msg(rfcomm, 0, frame_size, 0xf, credits, dlci,
 				   TRUE);
 	} else {