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

[Peter K. <pk...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bcsp.c          1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* Made bcsp_write_top() return a value.
* Optimized init_bcsp_packet().


The diff of the modified file(s):

--- bcsp.c	2001/05/17 15:25:15	1.3
+++ bcsp.c	2001/05/17 15:37:03	1.4
@@ -51,6 +51,8 @@
 #include <linux/malloc.h>
 #include <linux/bluetooth/bcsp.h>
 #include <linux/bluetooth/bcsp_debug.h>
+#include <linux/bluetooth/bluetooth.h>
+#include <linux/bluetooth/hci.h>
=20
 /****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
@@ -163,7 +165,7 @@
 	PRINTPKT(data, len);
=20
 	while (handled < len) {
-		memset(&bcsp, 0, sizeof(bcsp));
+		init_bcsp_packet(&bcsp);
 		handled +=3D slip_receive(&bcsp, data + handled, len - handled);
 		D(__FUNCTION__ ": So far handled: %d bytes\n", handled);
 		if (bcsp.packet) {
@@ -178,26 +180,29 @@
 bcsp_write_top(u8 *data, u32 len)
 {
 	u16 opcode;
+	s32 ret =3D -EINVAL;
=20=09
 	switch (data[0]) {
 	case CMD_PKT:
 		opcode =3D CHAR2INT16(data[2], data[1]);
 		if (hci_get_ocf(opcode) =3D=3D BCSP_OCF) {
-			sequence_send(data + 5, len - 5, data[4] & 0x3f);
+			ret =3D sequence_send(data + 5, len - 5, data[4] & 0x3f);
 		} else {
-			sequence_send(data + 1, len - 1, BCSP_CMD_CHN);
+			ret =3D sequence_send(data + 1, len - 1, BCSP_CMD_CHN);
 		}
 		break;
 	case ACL_PKT:
-		sequence_send(data + 1, len - 1, BCSP_ACL_CHN);
+		ret =3D sequence_send(data + 1, len - 1, BCSP_ACL_CHN);
 		break;
 	case SCO_PKT:
-		sequence_send(data + 1, len - 1, BCSP_SCO_CHN);
+		ret =3D sequence_send(data + 1, len - 1, BCSP_SCO_CHN);
 		break;
 	default:
 		D_ERR(__FUNCTION__ ": Unknown packet type: 0x%x\n", data[0]);
 		break;
 	}
+
+	return ret;
 }
=20
 s32
@@ -209,14 +214,7 @@
 void
 init_bcsp_packet(struct bcsp *bcsp)
 {
-	bcsp->flags =3D 0;
-	bcsp->identifier =3D 0;
-	bcsp->payload_length =3D 0;
-	bcsp->checksum =3D 0;
-	bcsp->payload =3D NULL;
-	bcsp->crc =3D 0;
-	bcsp->packet =3D NULL;
-	bcsp->packet_length =3D 0;
+	memset(bcsp, 0, sizeof *bcsp);
 };
=20
 /****************** END OF FILE bcsp.c ***********************************=
***/