pespin submitted this change.

View Change

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved
  fixeria: Looks good to me, but someone else must approve

osmux: Drop unused role parameter

Change-Id: I39c2852bb60aaba4f85188c55f157e4abec47a0e
---
M include/osmocom/mgcp/osmux.h
M src/libosmo-mgcp/mgcp_osmux.c
M src/libosmo-mgcp/mgcp_protocol.c
3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h
index 1da7c8b..903d58b 100644
--- a/include/osmocom/mgcp/osmux.h
+++ b/include/osmocom/mgcp/osmux.h
@@ -4,16 +4,11 @@
 
 #include <osmocom/netif/osmux.h>
 struct mgcp_conn_rtp;
-enum {
-	OSMUX_ROLE_BSC = 0,
-	OSMUX_ROLE_BSC_NAT,
-};
-
 struct mgcp_trunk;
 struct mgcp_endpoint;
 struct mgcp_conn_rtp;
 
-int osmux_init(int role, struct mgcp_trunk *trunk);
+int osmux_init(struct mgcp_trunk *trunk);
 int osmux_init_conn(struct mgcp_conn_rtp *conn);
 int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn,
 		      const struct osmo_sockaddr *addr);
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 302fd4d..c2b6ba1 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -440,7 +440,7 @@
 	return 0;
 }
 
-int osmux_init(int role, struct mgcp_trunk *trunk)
+int osmux_init(struct mgcp_trunk *trunk)
 {
 	int ret;
 	struct mgcp_config *cfg = trunk->cfg;
diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c
index 67a185a..1d286ed 100644
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -741,7 +741,7 @@
 static int mgcp_osmux_setup(struct mgcp_endpoint *endp, const char *line)
 {
 	if (!endp->trunk->cfg->osmux_initialized) {
-		if (osmux_init(OSMUX_ROLE_BSC, endp->trunk) < 0) {
+		if (osmux_init(endp->trunk) < 0) {
 			LOGPENDP(endp, DOSMUX, LOGL_ERROR, "Cannot init OSMUX\n");
 			return -3;
 		}

1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

To view, visit change 29641. To unsubscribe, or for help writing mail filters, visit settings.