From 97ccbf71b311639f6668fcb952806a3c0931d114 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 31 Jan 2021 11:49:19 +0100 Subject: ns2: Rename nsi->rate_ctr_idx to nsi->nsvc_rate_ctr_idx We will soon get another of those indexes. Change-Id: I68a2ef3b48097f524831dd04821824b21d6d1e18 --- src/gb/gprs_ns2.c | 6 +++--- src/gb/gprs_ns2_internal.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 2dde6938..9c9da79b 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -508,17 +508,17 @@ struct gprs_ns2_vc *ns2_vc_alloc(struct gprs_ns2_vc_bind *bind, struct gprs_ns2_ nsvc->sig_weight = 1; nsvc->data_weight = 1; - nsvc->ctrg = rate_ctr_group_alloc(nsvc, &nsvc_ctrg_desc, bind->nsi->rate_ctr_idx); + nsvc->ctrg = rate_ctr_group_alloc(nsvc, &nsvc_ctrg_desc, bind->nsi->nsvc_rate_ctr_idx); if (!nsvc->ctrg) { goto err; } - nsvc->statg = osmo_stat_item_group_alloc(nsvc, &nsvc_statg_desc, bind->nsi->rate_ctr_idx); + nsvc->statg = osmo_stat_item_group_alloc(nsvc, &nsvc_statg_desc, bind->nsi->nsvc_rate_ctr_idx); if (!nsvc->statg) goto err_group; if (!ns2_vc_fsm_alloc(nsvc, id, initiater)) goto err_statg; - bind->nsi->rate_ctr_idx++; + bind->nsi->nsvc_rate_ctr_idx++; llist_add(&nsvc->list, &nse->nsvc); llist_add(&nsvc->blist, &bind->nsvc); diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 4a899ed5..f3c68f50 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -128,7 +128,7 @@ struct gprs_ns2_inst { uint16_t timeout[NS_TIMERS_COUNT]; /*! workaround for rate counter until rate counter accepts char str as index */ - uint32_t rate_ctr_idx; + uint32_t nsvc_rate_ctr_idx; /*! libmnl netlink socket for link state monitoring */ struct osmo_mnl *linkmon_mnl; -- cgit v1.2.3