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.215           1.216=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Do not disable page scanning when shutting down the stack if it
has been started in DFU mode.


The diff of the modified file(s):

--- bluetooth.c	2001/12/04 12:27:02	1.215
+++ bluetooth.c	2001/12/07 17:45:06	1.216
@@ -3022,14 +3022,16 @@
 {
 	s32 i;
 	struct bt_session *bt;
-	DSYS("Shutting down bluetooth stack\n");
=20
-	/* Disable page scan as we don't want any new connections now */
-	DSYS("Disabling page scan\n");
+	DSYS("Shutting down bluetooth stack\n");
=20
-	hci_write_scan_enable(0x00);
 	if (bt_stack_initiated) {
 		if (!bt_dfu_mode(-1)) {
+			/* Disable page scan as we don't want any new
+			   connections now */
+			DSYS("Disabling page scan\n");
+			hci_write_scan_enable(0x00);
+
 			/* disconnect all active connections */
 			for (i =3D 0; i < BT_NBR_DATAPORTS;i++) {
 				bt =3D &bt_ctrl.session[i];