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 <[email protected]>
Gerrit-MessageType: newchange
