commit bf95f0fb2e63098f95864f3fa1fec1c3bc20091b
author Alexander Couzens <lynxis@fe80.eu> Thu Oct 01 22:56:03 2020 +0200
committer laforge <laforge@osmocom.org> Sat Oct 03 07:17:54 2020 +0000
tree 49d9c2534fb96566f4c68e9ffa19ff5bec9e1ffd
parent 477ffb0e72773607dbabe7adf2473818008589c0

ns2: refactor ns2_prim_status_ind()

Replace parameters nsi + nsei with a single nse pointer.

Change-Id: I35f6381110ba7ba1e013f21120e971362bdff55b

src/gb/gprs_ns2.c

diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c
index 05d4972..53500d1 100644
--- a/src/gb/gprs_ns2.c
+++ b/src/gb/gprs_ns2.c
@@ -344,18 +344,18 @@
  *  \param[in] nsei NSEI to which the statue relates
  *  \param[in] bvci BVCI to which the status relates
  *  \param[in] cause The cause of the status */
-void ns2_prim_status_ind(struct gprs_ns2_inst *nsi,
-			 uint16_t nsei, uint16_t bvci,
+void ns2_prim_status_ind(struct gprs_ns2_nse *nse,
+			 uint16_t bvci,
 			 enum gprs_ns2_affecting_cause cause)
 {
 	struct osmo_gprs_ns2_prim nsp = {};
-	nsp.nsei = nsei;
+	nsp.nsei = nse->nsei;
 	nsp.bvci = bvci;
 	nsp.u.status.cause = cause;
 	nsp.u.status.transfer = -1;
 	osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_STATUS,
 			PRIM_OP_INDICATION, NULL);
-	nsi->cb(&nsp.oph, nsi->cb_data);
+	nse->nsi->cb(&nsp.oph, nse->nsi->cb_data);
 }
 
 /*! Allocate a NS-VC within the given bind + NSE.
@@ -410,8 +410,7 @@
 	if (!nsvc)
 		return;
 
-	ns2_prim_status_ind(nsvc->nse->nsi, nsvc->nse->nsei,
-			    0, NS_AFF_CAUSE_VC_FAILURE);
+	ns2_prim_status_ind(nsvc->nse, 0, NS_AFF_CAUSE_VC_FAILURE);
 
 	llist_del(&nsvc->list);
 	llist_del(&nsvc->blist);
@@ -579,8 +578,7 @@
 		gprs_ns2_free_nsvc(nsvc);
 	}
 
-	ns2_prim_status_ind(nse->nsi, nse->nsei,
-			    0, NS_AFF_CAUSE_FAILURE);
+	ns2_prim_status_ind(nse, 0, NS_AFF_CAUSE_FAILURE);
 
 	llist_del(&nse->list);
 	if (nse->bss_sns_fi)
@@ -932,8 +930,7 @@
 	if (unblocked) {
 		/* this is the first unblocked NSVC on an unavailable NSE */
 		nse->alive = true;
-		ns2_prim_status_ind(nse->nsi, nse->nsei,
-				    0, NS_AFF_CAUSE_RECOVERY);
+		ns2_prim_status_ind(nse, 0, NS_AFF_CAUSE_RECOVERY);
 		return;
 	}
 
@@ -950,8 +947,7 @@
 
 	/* nse became unavailable */
 	nse->alive = false;
-	ns2_prim_status_ind(nse->nsi, nse->nsei,
-			    0, NS_AFF_CAUSE_FAILURE);
+	ns2_prim_status_ind(nse, 0, NS_AFF_CAUSE_FAILURE);
 }
 
 /*! Create a new GPRS NS instance