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

[Peter K. <pk...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bluetooth.c     1.149           1.150=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Do not do a hangup on ttyBTC when it is closed.


The diff of the modified file(s):

--- bluetooth.c	2001/03/15 16:27:33	1.149
+++ bluetooth.c	2001/03/18 14:23:52	1.150
@@ -1163,7 +1163,7 @@
=20=09
 	/* Now hangup all active upper tty:s */
=20=09
-	while (line < BT_NBR_PORTS)
+	while (line < BT_NBR_DATAPORTS)
 	{
 		if ((SESSIONSTATE(line) =3D=3D BT_ACTIVE) ||
 		    (SESSIONSTATE(line) =3D=3D BT_UPPERCONNECTED))
@@ -2239,7 +2239,7 @@
 	pos +=3D sprintf(buf+pos, "\n[BT Interface]\n");
=20=09
 	/* Data TTY:s */
-	for (line =3D 0; line < (BT_NBR_PORTS-1); line++) {
+	for (line =3D 0; line < BT_NBR_DATAPORTS; line++) {
 		pos +=3D sprintf(buf+pos, "line[%d] state : %s\n", line,
 			       statename(SESSIONSTATE(line)));
 	}
@@ -2380,7 +2380,7 @@
 	DSYS("Registering tty on line %d\n", line);
=20=09
 	/* Allow multiple open for ttyBTC */
-	if (line =3D=3D (BT_NBR_PORTS-1)) {
+	if (line =3D=3D BT_NBR_PORTS-BT_NBR_CTRLPORTS) {
 		NBR_CTRL_FDS++;
=20=09=09
 		DSYS("Now %d open fd:s for ttyBTC\n",=20
@@ -2423,9 +2423,8 @@
 {
 	DSYS("Unregistering tty on line %d\n", line);
=20
-	if (line =3D=3D (BT_NBR_PORTS-1)) {
-		NBR_CTRL_FDS--;
-		if (NBR_CTRL_FDS !=3D 0)
+	if (line =3D=3D BT_NBR_PORTS-BT_NBR_CTRLPORTS) {
+		if (--NBR_CTRL_FDS !=3D 0)
 			return 0; /* still more open fd:s on ttyBTC */
 	}
=20