1 files changed, 14 insertions, 14 deletions

diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c
index 2061adb3..2298921c 100644
--- a/src/host/layer23/src/common/l1l2_interface.c
+++ b/src/host/layer23/src/common/l1l2_interface.c
@@ -102,31 +102,31 @@ int layer2_open(struct osmocom_ms *ms, const char *socket_path)
 	int rc;
 	struct sockaddr_un local;
 
-	ms->wq.bfd.fd = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (ms->wq.bfd.fd < 0) {
+	ms->l2_wq.bfd.fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (ms->l2_wq.bfd.fd < 0) {
 		fprintf(stderr, "Failed to create unix domain socket.\n");
-		return ms->wq.bfd.fd;
+		return ms->l2_wq.bfd.fd;
 	}
 
 	local.sun_family = AF_UNIX;
 	strncpy(local.sun_path, socket_path, sizeof(local.sun_path));
 	local.sun_path[sizeof(local.sun_path) - 1] = '\0';
 
-	rc = connect(ms->wq.bfd.fd, (struct sockaddr *) &local,
+	rc = connect(ms->l2_wq.bfd.fd, (struct sockaddr *) &local,
 		     sizeof(local.sun_family) + strlen(local.sun_path));
 	if (rc < 0) {
 		fprintf(stderr, "Failed to connect to '%s'.\n", local.sun_path);
-		close(ms->wq.bfd.fd);
+		close(ms->l2_wq.bfd.fd);
 		return rc;
 	}
 
-	write_queue_init(&ms->wq, 100);
-	ms->wq.bfd.data = ms;
-	ms->wq.bfd.when = BSC_FD_READ;
-	ms->wq.read_cb = layer2_read;
-	ms->wq.write_cb = layer2_write;
+	write_queue_init(&ms->l2_wq, 100);
+	ms->l2_wq.bfd.data = ms;
+	ms->l2_wq.bfd.when = BSC_FD_READ;
+	ms->l2_wq.read_cb = layer2_read;
+	ms->l2_wq.write_cb = layer2_write;
 
-	rc = bsc_register_fd(&ms->wq.bfd);
+	rc = bsc_register_fd(&ms->l2_wq.bfd);
 	if (rc != 0) {
 		fprintf(stderr, "Failed to register fd.\n");
 		return rc;
@@ -137,8 +137,8 @@ int layer2_open(struct osmocom_ms *ms, const char *socket_path)
 
 int layer2_close(struct osmocom_ms *ms)
 {
-	close(ms->wq.bfd.fd);
-	bsc_unregister_fd(&ms->wq.bfd);
+	close(ms->l2_wq.bfd.fd);
+	bsc_unregister_fd(&ms->l2_wq.bfd);
 
 	return 0;
 }
@@ -156,7 +156,7 @@ int osmo_send_l1(struct osmocom_ms *ms, struct msgb *msg)
 	len = (uint16_t *) msgb_push(msg, sizeof(*len));
 	*len = htons(msg->len - sizeof(*len));
 
-	if (write_queue_enqueue(&ms->wq, msg) != 0) {
+	if (write_queue_enqueue(&ms->l2_wq, msg) != 0) {
 		LOGP(DL1C, LOGL_ERROR, "Failed to enqueue msg.\n");
 		msgb_free(msg);
 		return -1;