Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35782?usp=email )
Change subject: rlcmac: Add new structure to allow passing FN+TN to TBF handling functions
......................................................................
Patch Set 1:
(2 comments)
File src/rlcmac/rlcmac.c:
https://gerrit.osmocom.org/c/libosmo-gprs/+/35782/comment/6f0b963a_aa4eda39
PS1, Line 775: (struct gprs_rlcmac_dl_block_ind *)
`talloc_zero` is a macro, which does pointer cast for you, so this is not needed
```
#define talloc_zero(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type)
```
https://gerrit.osmocom.org/c/libosmo-gprs/+/35782/comment/937d91e4_ce30bc9c
PS1, Line 778: OSMO_ASSERT(dlbi);
You already dereferenced `dlbi` above, so assert()ing makes no sense. Move above?
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35782?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Ifa09cd70c915aa3a2b799412cb02315aaebc0503
Gerrit-Change-Number: 35782
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 02 Feb 2024 20:26:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-gprs/+/35786?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: rlcmac: Implement RLC_OCTET_COUNT in DL ACK/NACK
......................................................................
rlcmac: Implement RLC_OCTET_COUNT in DL ACK/NACK
This helps debugging what's already in the MS tx queue when requesting a
new UL TBF.
Change-Id: Ie5f399fa0bffed8e39811075feba47a54054c8e5
---
M include/osmocom/gprs/rlcmac/gre.h
M src/rlcmac/gre.c
M src/rlcmac/rlcmac_enc.c
M tests/rlcmac/rlcmac_prim_test.ok
4 files changed, 40 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/86/35786/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35786?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Ie5f399fa0bffed8e39811075feba47a54054c8e5
Gerrit-Change-Number: 35786
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35787?usp=email )
Change subject: rlcmac: tbf_ul: Fix wrong parenthesis around macro
......................................................................
rlcmac: tbf_ul: Fix wrong parenthesis around macro
The logic doesn't seem to be affected by the fact that the parenthesis
were wrong.
Change-Id: I3f4aeff45c3fd5a007b050bd78283baaca2a18d7
---
M src/rlcmac/tbf_ul.c
1 file changed, 15 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/87/35787/1
diff --git a/src/rlcmac/tbf_ul.c b/src/rlcmac/tbf_ul.c
index 26d710e..0ea0a9c 100644
--- a/src/rlcmac/tbf_ul.c
+++ b/src/rlcmac/tbf_ul.c
@@ -555,7 +555,7 @@
/* Returned as early return from function when amount of RLC blocks goes clearly over BS_CV_MAX */
#define BLK_COUNT_TOOMANY 0xff
/* We cannot early-check if extra_li0=true, since there may temporarily have too many rlc blocks: */
-#define BLK_COUNT_EARLY_CHECK_TOOMANY(st) (!(st)->extra_li0) && blk_count_to_x(st) > (st)->bs_cv_max)
+#define BLK_COUNT_EARLY_CHECK_TOOMANY(st) (!((st)->extra_li0) && blk_count_to_x(st) > (st)->bs_cv_max)
static uint8_t blk_count_append_llc_prio_queue(struct blk_count_state *st, const struct gprs_llc_prio_queue *pq)
{
struct msgb *msg;
@@ -563,7 +563,7 @@
llist_for_each_entry(msg, &pq->queue, list) {
blk_count_append_llc(st, msgb_l2len(msg));
/* We cannot early-check if extra_li0=true, since there may temporarily have too many rlc blocks. */
- if (BLK_COUNT_EARLY_CHECK_TOOMANY(st)
+ if (BLK_COUNT_EARLY_CHECK_TOOMANY(st))
return BLK_COUNT_TOOMANY; /* early return, not entering countdown procedure */
}
return 0;
@@ -592,7 +592,7 @@
/* First of all, the current LLC frame in progress: */
if (ul_tbf->llc_tx_msg) {
blk_count_append_llc(&st, msgb_length(ul_tbf->llc_tx_msg));
- if (BLK_COUNT_EARLY_CHECK_TOOMANY(&st)
+ if (BLK_COUNT_EARLY_CHECK_TOOMANY(&st))
goto done; /* early return, not entering countdown procedure */
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35787?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I3f4aeff45c3fd5a007b050bd78283baaca2a18d7
Gerrit-Change-Number: 35787
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35784?usp=email )
Change subject: apn_fsm: Set default timeout for APN activation to 65s
......................................................................
apn_fsm: Set default timeout for APN activation to 65s
The current timeout is too low, taking into account that SM PDP
Activation timeout is already 30. When SM fails, it will retry sending
PDP Context Activation Req. Hence, give it enough time to at least retry
once, plus some extra buffer time (eg to go through GMM attach once).
Change-Id: I34f9b0a5ad5767155dc3e4c0ac1c4bf1521be596
---
M src/host/layer23/src/common/apn_fsm.c
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/84/35784/1
diff --git a/src/host/layer23/src/common/apn_fsm.c b/src/host/layer23/src/common/apn_fsm.c
index 7636b0a..2b523f1 100644
--- a/src/host/layer23/src/common/apn_fsm.c
+++ b/src/host/layer23/src/common/apn_fsm.c
@@ -30,7 +30,7 @@
#define X(s) (1 << (s))
static struct osmo_tdef T_defs_apn[] = {
- { .T=1, .default_val=30, .desc = "Activating timeout (s)" },
+ { .T=1, .default_val=65, .desc = "Activating timeout (s)" },
{ 0 } /* empty item at the end */
};
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35784?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I34f9b0a5ad5767155dc3e4c0ac1c4bf1521be596
Gerrit-Change-Number: 35784
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange