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.172           1.173=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Moved the case for READ_COUNTRY_CODE to process_return_param()
(it had accidentally ended up in command_handler() which is
part of the HCI emulation; this is why a diff is a much better
way to send a patch...)


The diff of the modified file(s):

--- hci.c	2001/08/06 11:03:00	1.172
+++ hci.c	2001/08/06 15:38:18	1.173
@@ -1496,6 +1496,19 @@
=20
 		switch (ocf) {
=20
+		case READ_COUNTRY_CODE:
+			if (r_val[0]) {
+				D_ERR(__FUNCTION__ ": READ_COUNTRY_CODE : %s\n",
+				      get_err_msg(r_val[0]));
+				result_param =3D -r_val[0];
+			} else {
+				result_param =3D r_val[1];
+				D_CMD(__FUNCTION__ ": READ_COUNTRY_CODE : %d\n",
+				      result_param);
+			}
+			break;
+=09=09=09
+
 		case READ_LOCAL_VERSION_INFORMATION:
 			D_CMD(__FUNCTION__ ": READ_LOCAL_VERSION_INFORMATION\n");
 			if (r_val[0]) {
@@ -3617,7 +3630,6 @@
 			D_CMD(__FUNCTION__ ": CREATE_CONNECTION->connection request\n");
 			o_len =3D set_con_req_event(out_event, cmd->data, 1);
 			bt_write_lower_driver(o_event, o_len);
-=09=09=09
 			break;
=20=09=09=09
 		case DISCONNECT:
@@ -3663,20 +3675,6 @@
 	case HCI_IP:                 /* Informational parameters */
 		switch (hci_get_ocf(cmd->opcode)) {
=20=09=09=09
-		case HCIREADCOUNTRYCODE:
-
-			if (r_val[0]) {
-				D_ERR(__FUNCTION__": READ_COUNTRY_CODE : %s\n",=20
-				      get_err_msg(r_val[0]));
-				result_param =3D -r_val[0];
-			} else {
-				result_param =3D r_val[1];
-				D_CMD(__FUNCTION__": READ_COUNTRY_CODE : %d\n",=20
-				      result_param);
-			}
-			break;
-=09=09=09
-
 		case READ_BUFFER_SIZE:
 			D_CMD(__FUNCTION__ ": READ_BUFFER_SIZE->setting buffer size\n");
 			hci_ctrl.hc_buf.acl_num =3D ACL_NUM;