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.126           1.127=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* Corrected return values when receiving PSM not supported.
* Updated PSM-value for UPF-7



The diff of the modified file(s):

--- l2cap.c	2001/11/30 13:08:07	1.126
+++ l2cap.c	2002/01/06 17:33:04	1.127
@@ -997,12 +997,12 @@
 			return;
 		}
=20=20=20=20=20=20=20=20=20=20
-		con->c_status =3D conrsp->result;=09=09
+		con->c_result =3D conrsp->result;=09=09
+		con->c_status =3D CSTATUS_FAILED;
=20
 		switch (conrsp->result) {
 		case RES_SUCCESS:
-
-			con->c_result =3D RES_SUCCESS;
+			con->c_status =3D CSTATUS_SUCCESS;
 			l2ca_wakeup("l2cap con rsp", con);
=20
 #ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
@@ -1054,7 +1054,7 @@
 			disable_ertx(con);
 #endif
=20
-			l2ca_connect_cfm(con, MSGCODE(MSG_LAYER_L2CAP, conrsp->result));
+			l2ca_connect_cfm(con, conrsp->result);
=20
 			l2ca_wakeup("Got connect rsp neg", con);
=20=09=09=09
@@ -1626,7 +1626,7 @@
 	} while (con->c_status =3D=3D CSTATUS_RTX_TIMEOUT);
=20=09
=20
-	if (con->c_status !=3D RES_SUCCESS) {
+	if (con->c_status !=3D CSTATUS_SUCCESS) {
 		if(con->c_status =3D=3D CSTATUS_ERTX_TIMEOUT) {
 			l2ca_disconnect_ind(con);
 		}
@@ -1641,7 +1641,7 @@
 			break;
=20=09=09=09
 		default:=20=20=20
-			retval =3D -MSGCODE(MSG_LAYER_L2CAP, con->c_status);
+			retval =3D -MSGCODE(MSG_LAYER_L2CAP, con->c_result);
 		}
=20=09=09
 		ENTERSTATE(con, CLOSED);
@@ -3311,7 +3311,7 @@
 	case 0x1233:
 		return "TEST-2";
=20
-	case 0x4561:
+	case 0x4461:
 		return "TEST-3";
=20
 	default: