Index: btpd.c
===================================================================
RCS file: /usr/cvsroot/btp/btpd.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 btpd.c
--- btpd.c	8 Jan 2004 15:23:44 -0000	1.1.1.1
+++ btpd.c	5 Oct 2005 04:02:03 -0000
@@ -58,7 +58,7 @@
 #define STATE_CONNWAIT		2
 #define STATE_LINKQUALITY	3
 
-#define LQ_OPCODE (htobs(cmd_opcode_pack(OGF_STATUS_PARAM, OCF_GET_LINK_QUALITY)))
+#define LQ_OPCODE (htobs(cmd_opcode_pack(OGF_STATUS_PARAM, OCF_READ_LINK_QUALITY)))
 #define SETUP_OPCODE (htobs(cmd_opcode_pack(OGF_LINK_CTL, OCF_CREATE_CONN)))
 
 static struct btp_center {
@@ -374,10 +374,10 @@
 	return handle;
 }
 
-static int bt_get_link_quality(struct btp_watch *watch)
+static int bt_read_link_quality(struct btp_watch *watch)
 {
 	int res = 0;
-	if (hci_send_cmd(dd, OGF_STATUS_PARAM, OCF_GET_LINK_QUALITY, 2, &watch->handle)) {
+	if (hci_send_cmd(dd, OGF_STATUS_PARAM, OCF_READ_LINK_QUALITY, 2, &watch->handle)) {
 		fprintf(stderr, "lq hci_send_cmd failed to '%s': %s\n", watch->id, strerror(errno));
 		watch->state = STATE_IDLE;
 		res = -1;
@@ -392,7 +392,7 @@
 static int bt_send_disc(struct btp_watch *watch)
 {
 	int res = 0;
-	if (hci_send_cmd(dd, OGF_STATUS_PARAM, OCF_GET_LINK_QUALITY, 2, &watch->handle)) {
+	if (hci_send_cmd(dd, OGF_STATUS_PARAM, OCF_READ_LINK_QUALITY, 2, &watch->handle)) {
 		fprintf(stderr, "lq hci_send_cmd failed to '%s': %s\n", watch->id, strerror(errno));
 		watch->state = STATE_IDLE;
 		res = -1;
@@ -505,7 +505,7 @@
 		   start the link request */
 		if (watch->retry < now) {
 			printf("Time to try to do link quality on '%s'!\n", watch->id);
-			bt_get_link_quality(watch);
+			bt_read_link_quality(watch);
 		}
 		break;
 	case STATE_LINKQUALITY:
@@ -525,7 +525,7 @@
 	evt_cmd_status   *cs;
 	evt_conn_complete *ecc;
 	evt_disconn_complete *dcc;
-	get_link_quality_rp *rp;
+	read_link_quality_rp *rp;
 	hci_event_hdr *hdr;
 	struct btp_watch *watch;