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

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

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.171           1.172=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Use READ_COUNTRY_CODE as op-code in hci_read_country_code(),
instead of HCIREADCOUNTRYCODE (which is the name of the ioctl...)


The diff of the modified file(s):

--- hci.c	2001/08/02 16:06:48	1.171
+++ hci.c	2001/08/06 11:03:00	1.172
@@ -2961,8 +2961,7 @@
 	D_CMD(__FUNCTION__ "\n");
=20=09
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.ocf =3D READ_LOCAL_VERSION_INFORMATION;
-	c_pkt.ogf =3D HCI_IP;
+	c_pkt.opcode =3D hci_put_opcode(READ_LOCAL_VERSION_INFORMATION, HCI_IP);
 	c_pkt.len =3D 0;
=20
         if (block)
@@ -2975,19 +2974,17 @@
 s32 hci_read_country_code(void)
 {
 	s32 tmp;
+
 	D_CMD(__FUNCTION__"\n");
+
 	c_pkt.type =3D CMD_PKT;
-	c_pkt.opcode =3D hci_put_opcode(HCIREADCOUNTRYCODE, HCI_IP);
+	c_pkt.opcode =3D hci_put_opcode(READ_COUNTRY_CODE, HCI_IP);
 	c_pkt.len =3D 0;
=20=09
 	tmp =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N,
 			     DEFAULT_TIMEOUT);
=20
-	if (tmp < 0) {
-		return tmp;
-	} else {
-		return result_param;
-	}
+	return tmp < 0 ? tmp : result_param;
 }
=20
 /*