[MERGED] osmo-pcu[master]: move statistics counter rlc_sent() to gprs_rlcmac_sched
diff mbox

Message ID 20160520163208.551676D97@lists.osmocom.org
State New
Headers show

Commit Message

gerrit-no-reply@lists.osmocom.org May 20, 2016, 4:32 p.m. UTC
Holger Freyther has submitted this change and it was merged.

Change subject: move statistics counter rlc_sent() to gprs_rlcmac_sched
......................................................................


move statistics counter rlc_sent() to gprs_rlcmac_sched

The counter rlc_sent has nothing to do with the TBF.
The RLC packet got sent in the gprs_rlcmac_sched().

Change-Id: I5d2b910ea7cc250f17530406eda3be9b29b051fd
Reviewed-on: https://gerrit.osmocom.org/84
Tested-by: Jenkins Builder
Reviewed-by: Holger Freyther <holger@freyther.de>
---
M src/gprs_rlcmac_sched.cpp
M src/tbf_dl.cpp
2 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Holger Freyther: Looks good to me, approved

Patch
diff mbox

diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp
index 313e23f..8e05623 100644
--- a/src/gprs_rlcmac_sched.cpp
+++ b/src/gprs_rlcmac_sched.cpp
@@ -341,8 +341,11 @@ 
 		dl_ass_tbf, ul_ack_tbf);
 
 	/* Prio 2: select data message for downlink */
-	if (!msg)
+	if (!msg) {
 		msg = sched_select_downlink(bts, trx, ts, fn, block_nr, pdch);
+		if (msg)
+			bts->bts->rlc_sent();
+	}
 
 	/* Prio 3: send dummy contol message */
 	if (!msg)
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index 9e4d078..62d378f 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -762,8 +762,6 @@ 
 	/* Increment TX-counter */
 	m_tx_counter++;
 
-	bts->rlc_sent();
-
 	return dl_msg;
 }