pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33260 ) Change subject: tbf_{ul,dl}_fsm: Remove unneeded asserts ...................................................................... tbf_{ul,dl}_fsm: Remove unneeded asserts Those are leftovers from the time where we had a single tbf_fsm for both UL and DL TBF. Change-Id: I99359b8cb655b26ac2058f457423fdec178744ea --- M src/tbf_dl_fsm.c M src/tbf_ul_fsm.c 2 files changed, 12 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/tbf_dl_fsm.c b/src/tbf_dl_fsm.c index a0e47b7..65070d3 100644 --- a/src/tbf_dl_fsm.c +++ b/src/tbf_dl_fsm.c @@ -244,10 +244,8 @@ static void st_finished(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct tbf_dl_fsm_ctx *ctx = (struct tbf_dl_fsm_ctx *)fi->priv; - switch (event) { case TBF_EV_DL_ACKNACK_MISS: - OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF); break; case TBF_EV_FINAL_ACK_RECVD: /* We received Final Ack (DL ACK/NACK) from MS. move to @@ -309,10 +307,8 @@ static void st_releasing(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct tbf_dl_fsm_ctx *ctx = (struct tbf_dl_fsm_ctx *)fi->priv; switch (event) { case TBF_EV_DL_ACKNACK_MISS: - OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF); /* Ignore, we don't care about missed DL ACK/NACK poll timeouts * anymore, we are already releasing the TBF */ break; diff --git a/src/tbf_ul_fsm.c b/src/tbf_ul_fsm.c index 8778e32..11ed8ab 100644 --- a/src/tbf_ul_fsm.c +++ b/src/tbf_ul_fsm.c @@ -171,7 +171,6 @@ switch (event) { case TBF_EV_FIRST_UL_DATA_RECVD: - OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_UL_TBF); /* TS 44.060 7a.2.1.1: "The contention resolution is completed on * the network side when the network receives an RLC data block that * comprises the TLLI value that identifies the mobile station and the @@ -222,7 +221,6 @@ ul_tbf_contention_resolution_success(tbf_as_ul_tbf(ctx->tbf)); break; case TBF_EV_FINAL_UL_ACK_CONFIRMED: - OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_UL_TBF); new_ul_tbf_requested = (bool)data; /* Ref the MS, otherwise it may be freed after ul_tbf is * detached when sending event below. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I99359b8cb655b26ac2058f457423fdec178744ea Gerrit-Change-Number: 33260 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged