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

[Mats F. <ma...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.154           1.155=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Initialize cmd_num to 0 when using bcsp


The diff of the modified file(s):

--- hci.c	2001/06/06 14:53:11	1.154
+++ hci.c	2001/06/07 06:47:21	1.155
@@ -816,8 +816,8 @@
 		test_hci_hdl =3D hci_hdl;
=20
   		if (link_type =3D=3D ACL_LINK) {
-  			lp_connect_cfm(buf + 3, (u32) buf[0], hci_hdl);
=20
+			lp_connect_cfm(buf + 3, (u32) buf[0], hci_hdl);
 #ifndef HCI_EMULATION
 			if (buf[0]) {
 				/* remove hci handle if connection failed */
@@ -1838,12 +1838,14 @@
 	hci_ctrl.nbr_of_connections =3D 0;
=20
 #ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP
-	/* After syncing BCSP we receive a command status with cmd num */
-	if (!bt_use_bcsp(-1))
+	if (!bt_use_bcsp(-1)) {
 	  hci_ctrl.hc_buf.cmd_num =3D 1;
-
-	  /* don't touch cmd num when using bcsp, is updated=20
-	     from command status event after syncronizing */
+	} else {
+		/* cmd_num will be set from command status event after
+		   syncronizing bcsp, until then we shouldn't send any
+		   commands */
+		hci_ctrl.hc_buf.cmd_num =3D 0;
+	}
=20
 #else
 	hci_ctrl.hc_buf.cmd_num =3D 1;