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.163           1.164=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* If acl_num =3D=3D 0, we shouldn't schedule in hci_trig_send
* Added function to check acl_num, needed in bcsp_sequence


The diff of the modified file(s):

--- hci.c	2001/07/05 10:52:45	1.163
+++ hci.c	2001/07/06 06:56:08	1.164
@@ -685,7 +685,7 @@
 hci_trig_send(void)
 {
 #ifdef __KERNEL__
-	if (buf_count()) {
+	if (buf_count() && (hci_ctrl.hc_buf.acl_num > 0)) {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 		queue_task(&send_data_task, &tq_scheduler);
 #else
@@ -702,6 +702,12 @@
 #endif
 }
=20
+s32
+hci_acl_num_cnt(void)
+{
+	return hci_ctrl.hc_buf.acl_num;
+}
+
 void
 update_ncp(u8 nbr_of_hdl, u8 *pkt)
 {
@@ -985,6 +991,7 @@
 		     This must be signalled using lp_connect_cfm (neg)
 		  */
 			D_ERR(__FUNCTION__ ": COMMAND_STATUS: %s\n", get_err_msg(buf[0]));
+
 #ifdef USE_INQTIMER
 			if (hci_inq_pending)
 				release_inq_timer();
@@ -1564,6 +1571,7 @@
 		break;
 	}
 }
+
=20
 /*Parses an ACL-data packet and copies it into the hci_in-buffer, data is =
a=20
   pointer to the data in the memory, pb_flag is the packet boundary flag=
=20