msuraev has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/29691 )
Change subject: cosmetic: make linter happy with LAPD code
......................................................................
cosmetic: make linter happy with LAPD code
The weird formatting not only makes it hard to read but caused linter to fail in the
follow-up patch.
Change-Id: Ie4e56b4796c1b8f270a692453faccf102c963db5
---
M src/gsm/lapd_core.c
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/gsm/lapd_core.c b/src/gsm/lapd_core.c
index ced8bc0..61fcc2f 100644
--- a/src/gsm/lapd_core.c
+++ b/src/gsm/lapd_core.c
@@ -767,8 +767,7 @@
* link layer entity shall reset the timer T200 on
* receipt of a valid I frame with N(R) higher than V(A),
* or an REJ with an N(R) equal to V(A). */
- if ((!rej && nr != dl->v_ack)
- || (rej && nr == dl->v_ack)) {
+ if ((!rej && nr != dl->v_ack) || (rej && nr == dl->v_ack)) {
t200_reset = 1;
lapd_stop_t200(dl);
/* 5.5.3.1 Note 1 + 2 imply timer recovery cond. */
@@ -777,8 +776,7 @@
* N(R) is called valid, if and only if
* (N(R)-V(A)) mod 8 <= (V(S)-V(A)) mod 8.
*/
- if (sub_mod(nr, dl->v_ack, dl->v_range)
- > sub_mod(dl->v_send, dl->v_ack, dl->v_range)) {
+ if (sub_mod(nr, dl->v_ack, dl->v_range) > sub_mod(dl->v_send, dl->v_ack,
dl->v_range)) {
LOGDL(dl, LOGL_NOTICE, "N(R) sequence error\n");
mdl_error(MDL_CAUSE_SEQ_ERR, lctx);
}
--
To view, visit
https://gerrit.osmocom.org/c/libosmocore/+/29691
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ie4e56b4796c1b8f270a692453faccf102c963db5
Gerrit-Change-Number: 29691
Gerrit-PatchSet: 1
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged