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

[Fredrik S. <fre...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.192           1.193=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Change default link supervision timeout from 20 sec to 5 sec.


The diff of the modified file(s):

--- hci.c	12 Feb 2002 11:02:21 -0000	1.192
+++ hci.c	13 Feb 2002 10:04:54 -0000	1.193
@@ -883,6 +883,10 @@
 				}
 				/* reset variable again */
 				i_am_initiator =3D 0;
+
+				/* Change link supervision timeout. */
+				hci_write_link_supervision_to(
+					hci_hdl, DEFAULT_LINK_SUPERVISION_TIMEOUT, 0);
 			}
 #endif /* HCI_EMULATION */
=20
@@ -2956,7 +2960,7 @@
 }
=20
 s32=20
-hci_write_link_supervision_to(u32 hdl, u32 link_to)
+hci_write_link_supervision_to(u32 hdl, u32 link_to, s32 block)
 {
 	D_CMD(__FUNCTION__ "\n");
 	c_pkt.type =3D CMD_PKT;
@@ -2967,10 +2971,10 @@
 	c_pkt.data[3] =3D (link_to >> 8) & 0xff;
 	c_pkt.len =3D 4;
=20=20=20
-	print_data("write_link_to:",(u8*)&c_pkt,
-		   c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN);
-
+	if (block)
 	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
, DEFAULT_TIMEOUT);
+        else
+		return send_cmd((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN);
 }
=20
 /* Defines of Informational Parameters function */