CVS: The file 'linux/drivers/char/bluetooth/hci_vendor.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_vendor.c    1.45            1.46=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made userstack compile


The diff of the modified file(s):

--- hci_vendor.c	2001/06/13 11:55:16	1.45
+++ hci_vendor.c	2001/06/15 13:39:08	1.46
@@ -680,7 +680,6 @@
=20=09
 	return bt_write_lower_driver((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_=
HDR_LEN);
 }
-#endif
=20
 /* When using BCSP this function is used to wait for the
    COMMAND_STATUS which contains cmd_num */
@@ -699,6 +698,8 @@
 	}
 }
=20
+#endif
+
 s32=20
 csr_pskey(u16 ps_key, u16 rw_mode, u16 *retb, u16 n_pars)
 {
@@ -977,8 +978,9 @@
 	tmp =3D bt_write_lower_driver((u8*) &c_pkt,=20
 				    c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN);
=20
+#ifdef __KERNEL__
 	bt_wait_tx(2000); /* wait until DMA empty + 2 ms */
-
+#endif
 	hci_ctrl.hc_buf.cmd_num--;
=20
 	return tmp;