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

[Gordon M. <gm...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bluetooth.c     1.162           1.163=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

--Backed out my last change. A closer look shows that we can use /dev/ttyBT=
C (and only /dev/ttyBTC) for SDP connections. When we open /dev/ttyBTC it r=
emains in the BT_INACTIVE state. Then bt_register_sdp will move it to BT_AC=
TIVE, and bt_unregister_sdp will move it back to BT_INACTIVE. This does mea=
n that we can only have one SDP connection in the system at a time, so it's=
 still not ideal.


The diff of the modified file(s):

--- bluetooth.c	2001/04/17 05:33:19	1.162
+++ bluetooth.c	2001/04/17 06:09:19	1.163
@@ -2412,8 +2412,7 @@
 		D_WARN("bt_register_sdp: Pending SDP data for this new connection @ line=
 %d\n", line);
 	}
=20
-	if ((SESSIONSTATE(line) =3D=3D BT_INACTIVE) ||
-	    (SESSIONSTATE(line) =3D=3D BT_UPPERCONNECTED)){
+	if (SESSIONSTATE(line) =3D=3D BT_INACTIVE) {
 		/* now register ! */
 		DSYS("bt_register_sdp : line %d\n", line);
 		SESSIONSTATE(line) =3D BT_ACTIVE;