CVS: 2 files have been modified in linux/drivers/char/bluetooth.

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

The following files were modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
Config.in       1.12            1.13=20=20=20=20=20=20=20=20=20=20=20=20
hci.c           1.145           1.146=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Always do master/slave switch as server if it is enabled (it can be
turned off using the BTSETMSSWITCH ioctl).


The diff of the modified file(s):

--- Config.in	2001/04/27 16:46:21	1.12
+++ Config.in	2001/04/29 11:37:02	1.13
@@ -30,8 +30,6 @@
   bool '  Enable M/S Switch'          CONFIG_BLUETOOTH_ENABLE_MSSWITCH
=20
   if [ "$CONFIG_BLUETOOTH_ENABLE_MSSWITCH" =3D "y" ]; then
-    bool '    Force M/S Switch as server' CONFIG_BLUETOOTH_FORCE_MSSWITCH
-
     # CSR can't do scatternet yet, so we need to do M/S switch=20
     # as early as in lp_connect_rsp()
     if [ "$CONFIG_BLUETOOTH_CSR" =3D "y" ]; then
--- hci.c	2001/04/27 15:19:29	1.145
+++ hci.c	2001/04/29 11:37:02	1.146
@@ -1743,12 +1743,7 @@
 #ifdef CONFIG_BLUETOOTH_ENABLE_MSSWITCH
 	DSYS("M/S switch enabled\n");
=20
-#ifdef CONFIG_BLUETOOTH_FORCE_MSSWITCH
 	hci_force_msswitch(1);
-#else
-	hci_force_msswitch(0);
-#endif
-
 #else /* CONFIG_BLUETOOTH_ENABLE_MSSWITCH */
 	DSYS("M/S switch disabled\n");
 #endif