From edce6a49fccee673dc191931a125b40a25d9c27a Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 20 Aug 2013 16:10:17 -0700
Subject: [PATCH] monitor: Use explicit functionnames for btsnoop packet
 operations

---
 monitor/btsnoop.c | 4 ++--
 monitor/btsnoop.h | 4 ++--
 monitor/control.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/monitor/btsnoop.c b/monitor/btsnoop.c
index f59ec9914..6865f32a7 100644
--- a/monitor/btsnoop.c
+++ b/monitor/btsnoop.c
@@ -139,7 +139,7 @@ static void do_write(struct timeval *tv, uint32_t flags,
 	}
 }
 
-void btsnoop_write(struct timeval *tv, uint16_t index, uint16_t opcode,
+void btsnoop_write_hci(struct timeval *tv, uint16_t index, uint16_t opcode,
 					const void *data, uint16_t size)
 {
 	uint32_t flags;
@@ -220,7 +220,7 @@ int btsnoop_open(const char *path, uint32_t *type)
 	return 0;
 }
 
-int btsnoop_read(struct timeval *tv, uint16_t *index, uint16_t *opcode,
+int btsnoop_read_hci(struct timeval *tv, uint16_t *index, uint16_t *opcode,
 						void *data, uint16_t *size)
 {
 	struct btsnoop_pkt pkt;
diff --git a/monitor/btsnoop.h b/monitor/btsnoop.h
index 3165090d7..1081ef50b 100644
--- a/monitor/btsnoop.h
+++ b/monitor/btsnoop.h
@@ -32,9 +32,9 @@
 #define BTSNOOP_TYPE_EXTENDED_HCI	2001
 
 void btsnoop_create(const char *path, uint32_t type);
-void btsnoop_write(struct timeval *tv, uint16_t index, uint16_t opcode,
+void btsnoop_write_hci(struct timeval *tv, uint16_t index, uint16_t opcode,
 					const void *data, uint16_t size);
 int btsnoop_open(const char *path, uint32_t *type);
-int btsnoop_read(struct timeval *tv, uint16_t *index, uint16_t *opcode,
+int btsnoop_read_hci(struct timeval *tv, uint16_t *index, uint16_t *opcode,
 						void *data, uint16_t *size);
 void btsnoop_close(void);
diff --git a/monitor/control.c b/monitor/control.c
index bd67a0e98..2e6552e45 100644
--- a/monitor/control.c
+++ b/monitor/control.c
@@ -625,7 +625,7 @@ static void data_callback(int fd, uint32_t events, void *user_data)
 			break;
 		case HCI_CHANNEL_MONITOR:
 			packet_monitor(tv, index, opcode, data->buf, pktlen);
-			btsnoop_write(tv, index, opcode, data->buf, pktlen);
+			btsnoop_write_hci(tv, index, opcode, data->buf, pktlen);
 			break;
 		}
 	}
@@ -830,7 +830,7 @@ void control_reader(const char *path)
 	open_pager();
 
 	while (1) {
-		if (btsnoop_read(&tv, &index, &opcode, buf, &pktlen) < 0)
+		if (btsnoop_read_hci(&tv, &index, &opcode, buf, &pktlen) < 0)
 			break;
 
 		packet_monitor(&tv, index, opcode, buf, pktlen);
-- 
2.47.3