laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-e1d/+/27585 )
Change subject: intf_line: Ensure unique rate counter group indexes
......................................................................
intf_line: Ensure unique rate counter group indexes
When we have multiple interfaces, we cannot simply use the line->id
as rate counter group index, but should use a combination of interface
id and line id.
Change-Id: I515c1f39285489845f88c3403ebf16835571e154
---
M src/intf_line.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
tnt: Looks good to me, but someone else must approve
diff --git a/src/intf_line.c b/src/intf_line.c
index 9146368..bd7a393 100644
--- a/src/intf_line.c
+++ b/src/intf_line.c
@@ -247,7 +247,7 @@
} else
line->id = line_id;
- line->ctrs = rate_ctr_group_alloc(line, &line_ctrg_desc, line->id);
+ line->ctrs = rate_ctr_group_alloc(line, &line_ctrg_desc, intf->id << 8 |
line->id);
OSMO_ASSERT(line->ctrs);
osmo_timer_setup(&line->ts0.timer, _ts0_tmr_cb, line);
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit
https://gerrit.osmocom.org/c/osmo-e1d/+/27585
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I515c1f39285489845f88c3403ebf16835571e154
Gerrit-Change-Number: 27585
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-MessageType: merged