mirror of https://gerrit.osmocom.org/libosmocore
ns2: Rename nsi->rate_ctr_idx to nsi->nsvc_rate_ctr_idx
We will soon get another of those indexes. Change-Id: I68a2ef3b48097f524831dd04821824b21d6d1e18
This commit is contained in:
parent
bdfb8b9104
commit
97ccbf71b3
|
@ -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->sig_weight = 1;
|
||||||
nsvc->data_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) {
|
if (!nsvc->ctrg) {
|
||||||
goto err;
|
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)
|
if (!nsvc->statg)
|
||||||
goto err_group;
|
goto err_group;
|
||||||
if (!ns2_vc_fsm_alloc(nsvc, id, initiater))
|
if (!ns2_vc_fsm_alloc(nsvc, id, initiater))
|
||||||
goto err_statg;
|
goto err_statg;
|
||||||
|
|
||||||
bind->nsi->rate_ctr_idx++;
|
bind->nsi->nsvc_rate_ctr_idx++;
|
||||||
|
|
||||||
llist_add(&nsvc->list, &nse->nsvc);
|
llist_add(&nsvc->list, &nse->nsvc);
|
||||||
llist_add(&nsvc->blist, &bind->nsvc);
|
llist_add(&nsvc->blist, &bind->nsvc);
|
||||||
|
|
|
@ -128,7 +128,7 @@ struct gprs_ns2_inst {
|
||||||
uint16_t timeout[NS_TIMERS_COUNT];
|
uint16_t timeout[NS_TIMERS_COUNT];
|
||||||
|
|
||||||
/*! workaround for rate counter until rate counter accepts char str as index */
|
/*! 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 */
|
/*! libmnl netlink socket for link state monitoring */
|
||||||
struct osmo_mnl *linkmon_mnl;
|
struct osmo_mnl *linkmon_mnl;
|
||||||
|
|
Loading…
Reference in New Issue