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.105           1.106=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* added return codes in rfcomm_connect_req / rfcomm_disconnect_req


The diff of the modified file(s):

--- rfcomm.c	2001/04/18 15:47:13	1.105
+++ rfcomm.c	2001/04/25 17:01:22	1.106
@@ -703,7 +703,7 @@
=20
 /* This function creates an rfcomm connection over the control channel DCL=
I 0 */
=20=20=20
-u32=20
+s32=20
 rfcomm_connect_req(u8* bd_addr, u8 server_chn, u8 line)
 {
 #define FNC "rfcomm_connect_req: "
@@ -733,7 +733,7 @@
 		/* we don't have a l2cap connection yet */
 		if (l2ca_connect_req(bd_addr, RFCOMM_LAYER)) {
 			D_ERR(FNC"l2ca_connect_req failed\n");
-			return 0;
+			return -1;
 		}
 	} else if (!((rfcomm->l2cap)->current_state =3D=3D OPEN)) {
=20
@@ -771,7 +771,7 @@
 #undef FNC
 }
=20
-void=20
+s32
 rfcomm_disconnect_req(u8 line)
 {
 	rfcomm_con *rfcomm;
@@ -801,7 +801,6 @@
 		   disconnect 'acknowledge' */
=20
 		interruptible_sleep_on(&rfcomm_disconnect_wq);
-
 		/* Check that rfcomm session really disconnected */
 		/* FIXME -- add timer obj with status in rfcomm obj */
=20
@@ -809,8 +808,7 @@
 		if (rfcomm->dlci[0].state !=3D DISCONNECTED)
 		{
 			printk("Rfcomm disconnect failed, reset session\n");
-#ifdef __KERNEL__
-			bt_unregister_rfcomm(rfcomm->line);
+#ifdef __KERNEL__			bt_unregister_rfcomm(rfcomm->line);
 			bt_disconnect_cfm(CREATE_RFCOMM_ID(rfcomm->line, 0),=20
 					  rfcomm->l2cap->c_result);
 #endif
@@ -818,13 +816,12 @@
 		}
=20
 		/* Now rfcomm is disconnected, disconnect l2cap */
-
-		l2ca_disconnect_req(l2cap);
-
-		/* Now l2cap ch for RFCOMM is disconnected */
+		return l2ca_disconnect_req(l2cap);
 	}
 	else
 		D_WARN("rfcomm_disconnect_req : line not connected !\n");
+
+	return 0;
 }
=20=09
=20