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
----            -----------     -----------     -------
hci.c           1.181           1.182=20=20=20=20=20=20=20=20=20=20=20
hci_vendor.c    1.54            1.55=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Removed an unused hack to change the buffer sizes in a CSR module.


The diff of the modified file(s):

--- hci.c	2001/09/21 12:51:06	1.181
+++ hci.c	2001/10/02 11:00:25	1.182
@@ -2948,20 +2948,7 @@
 	c_pkt.len =3D 0;
=20
 	if (block) {
-		int ret =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_H=
DR_LEN, DEFAULT_TIMEOUT);
-#if 0
-                if (ret >=3D 0 &&
-                    hci_ctrl.hc_buf.acl_len =3D=3D 256 &&
-                    hci_ctrl.hc_buf.acl_num =3D=3D 4 &&
-                    hci_set_buffer_sizes(hci_ctrl.hc_buf.acl_len / 2,
-                                         hci_ctrl.hc_buf.acl_num * 2) >=3D=
 0) {
-                        c_pkt.type =3D CMD_PKT;
-                        c_pkt.opcode =3D hci_put_opcode(READ_BUFFER_SIZE, =
HCI_IP);
-                        c_pkt.len =3D 0;
-                        ret =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + C=
MD_HDR_LEN + HCI_HDR_LEN, DEFAULT_TIMEOUT);
-                }
-#endif
-                return ret;
+		return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N, DEFAULT_TIMEOUT);
         }
         else
 		return send_cmd((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN);
--- hci_vendor.c	2001/09/18 12:22:00	1.54
+++ hci_vendor.c	2001/10/02 11:00:25	1.55
@@ -897,55 +897,6 @@
 	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
, DEFAULT_TIMEOUT);
 }
=20
-s32=20
-hci_set_buffer_sizes(u16 len, u16 num)
-{
-	csr_msg *msg;
-	csr_bccmd *cmd;
-	csr_bccmd_ps *ps;
-        int ret;
-
-	D_CMD(__FUNCTION__ VENDOR "\n");
-
-	/* HCI Manufacturer specific header */
-	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(0x00, MANUFACTURER_SPEC);
-	c_pkt.len =3D 1 + 5*sizeof(u16) + 3*sizeof(u16) + 1*sizeof(u16);
-
-	msg =3D (csr_msg *)c_pkt.data;
-	cmd =3D (csr_bccmd *)msg->msg;
-	ps =3D (csr_bccmd_ps *)cmd->payload;
-
- 	/* General msg header */
-	CSR_SET_LAST(msg, 1); /* first and last segment */
-	CSR_SET_FIRST(msg, 1);
-	CSR_SET_CH_ID(msg, CSR_CH_ID_BCCMD);
-
-	/* BCCMD type */
-	cmd->type =3D CSR_MSGTYPE_SETREQ;
-	cmd->len =3D 5 + 3 + 1;
-	cmd->seq =3D csr_count++;
-	cmd->var_id =3D CSR_CMD_PS;
-	cmd->status =3D CSR_STATUS_OK; /* always OK in SETREQ */
-
-	/* Actual PS key request */
-	ps->ps_key =3D CSR_PS_MAX_ACL_PKTS;
-	ps->ps_len =3D 1; /* x 16 bits */
-	ps->unused =3D 0x0000;
-
-	ps->ps_val[0] =3D num;
-
-	ret =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N, DEFAULT_TIMEOUT);
-	if (ret < 0)
-		return ret;
-=09
-	cmd->seq =3D csr_count++;
-	ps->ps_key =3D CSR_PS_MAX_ACL_PKT_LEN;
-	ps->ps_val[0] =3D len;
-
-	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
, DEFAULT_TIMEOUT);
-}
-
 s32
 hci_read_firmware_rev_info(void)
 {