aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2020-09-24 00:47:17 +0200
committerlaforge <laforge@osmocom.org>2020-09-25 09:45:24 +0000
commitffd49d0757f040568326f00ccfb1cd69c4fb6fb2 (patch)
tree9161dcab5a9cb8077b099b4c6b336c13958d6556
parent38b19e88bbe0da721792f94995504524ee083ae3 (diff)
ns2: ns2_recv_vc: remove unused parameter nsi
-rw-r--r--src/gb/gprs_ns2.c4
-rw-r--r--src/gb/gprs_ns2_frgre.c6
-rw-r--r--src/gb/gprs_ns2_internal.h3
-rw-r--r--src/gb/gprs_ns2_udp.c6
4 files changed, 8 insertions, 11 deletions
diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c
index 835c22a1..05d49723 100644
--- a/src/gb/gprs_ns2.c
+++ b/src/gb/gprs_ns2.c
@@ -844,12 +844,10 @@ struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_nse(struct gprs_ns2_nse *nse,
/*! Bottom-side entry-point for received NS PDU from the driver/bind
- * \param[in] nsi NS instance
* \param[in] nsvc NS-VC for which the message was received
* \param msg the received message. Ownership is trasnferred, caller must not free it!
* \return 0 on success; negative on error */
-int ns2_recv_vc(struct gprs_ns2_inst *nsi,
- struct gprs_ns2_vc *nsvc,
+int ns2_recv_vc(struct gprs_ns2_vc *nsvc,
struct msgb *msg)
{
struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h;
diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c
index 715c41a6..0903e46e 100644
--- a/src/gb/gprs_ns2_frgre.c
+++ b/src/gb/gprs_ns2_frgre.c
@@ -446,7 +446,7 @@ static int handle_nsfrgre_read(struct osmo_fd *bfd)
rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc);
switch (rc) {
case GPRS_NS2_CS_FOUND:
- rc = ns2_recv_vc(bind->nsi, nsvc, msg);
+ rc = ns2_recv_vc(nsvc, msg);
break;
case GPRS_NS2_CS_ERROR:
case GPRS_NS2_CS_SKIPPED:
@@ -459,12 +459,12 @@ static int handle_nsfrgre_read(struct osmo_fd *bfd)
case GPRS_NS2_CS_CREATED:
frgre_alloc_vc(bind, nsvc, &saddr, dlci);
gprs_ns2_vc_fsm_start(nsvc);
- rc = ns2_recv_vc(bind->nsi, nsvc, msg);
+ rc = ns2_recv_vc(nsvc, msg);
break;
}
} else {
/* VC found */
- rc = ns2_recv_vc(bind->nsi, nsvc, msg);
+ rc = ns2_recv_vc(nsvc, msg);
}
out:
msgb_free(msg);
diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h
index 708eb59c..15b0bc50 100644
--- a/src/gb/gprs_ns2_internal.h
+++ b/src/gb/gprs_ns2_internal.h
@@ -203,8 +203,7 @@ enum gprs_ns2_cs ns2_create_vc(struct gprs_ns2_vc_bind *bind,
struct msgb **reject,
struct gprs_ns2_vc **success);
-int ns2_recv_vc(struct gprs_ns2_inst *nsi,
- struct gprs_ns2_vc *nsvc,
+int ns2_recv_vc(struct gprs_ns2_vc *nsvc,
struct msgb *msg);
struct gprs_ns2_vc *ns2_vc_alloc(struct gprs_ns2_vc_bind *bind,
diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c
index 9994a725..2f55f2a7 100644
--- a/src/gb/gprs_ns2_udp.c
+++ b/src/gb/gprs_ns2_udp.c
@@ -195,7 +195,7 @@ static int handle_nsip_read(struct osmo_fd *bfd)
rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc);
switch (rc) {
case GPRS_NS2_CS_FOUND:
- rc = ns2_recv_vc(bind->nsi, nsvc, msg);
+ rc = ns2_recv_vc(nsvc, msg);
break;
case GPRS_NS2_CS_ERROR:
case GPRS_NS2_CS_SKIPPED:
@@ -208,12 +208,12 @@ static int handle_nsip_read(struct osmo_fd *bfd)
case GPRS_NS2_CS_CREATED:
ns2_driver_alloc_vc(bind, nsvc, &saddr);
gprs_ns2_vc_fsm_start(nsvc);
- rc = ns2_recv_vc(bind->nsi, nsvc, msg);
+ rc = ns2_recv_vc(nsvc, msg);
break;
}
} else {
/* VC found */
- rc = ns2_recv_vc(bind->nsi, nsvc, msg);
+ rc = ns2_recv_vc(nsvc, msg);
}
msgb_free(msg);