aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-11-27 11:46:53 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-11-30 19:33:27 +0100
commit24482ad4e2797b4eb27f85ab8c836925c2ece5cd (patch)
treec54f74f39ac3d210e60c08a62331b323ca6e62a2
parent7ae0f9c271fd403bab96897056eb2efe87b2adec (diff)
follow-up: logging tweak for Immediate Assignment
follow-up to I9ad094d272254d7aee9b0a676201d4ed8cd727ca because it was merged before fixeria's code review could be incorporated. Change-Id: I474cf1a58d1f00ec5b0ae52bd095a60aad763975
-rw-r--r--src/osmo-bsc/lchan_fsm.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index 5e99239..742836c 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -97,17 +97,15 @@ static void _lchan_on_activation_failure(struct gsm_lchan *lchan, enum lchan_act
switch (activ_for) {
case FOR_MS_CHANNEL_REQUEST:
- if (lchan->activate.immediate_assignment_sent) {
- LOG_LCHAN(lchan, LOGL_ERROR,
- "lchan activation failed, after Immediate Assignment message was sent (%s)\n",
- lchan->last_error ? : "unknown error");
- /* Likely the MS never showed up. Just tear down the lchan. */
- } else {
+ if (!lchan->activate.immediate_assignment_sent) {
/* Failure before Immediate Assignment message, send a reject. */
LOG_LCHAN(lchan, LOGL_NOTICE, "Tx Immediate Assignment Reject (%s)\n",
lchan->last_error ? : "unknown error");
rsl_tx_imm_ass_rej(lchan->ts->trx->bts, lchan->rqd_ref);
}
+ /* Otherwise, likely the MS never showed up after the Assignment, and the failure cause
+ * (Timeout?) was already logged elsewhere. Just continue to tear down the lchan after
+ * lchan_on_activation_failure(), no additional action or logging needed. */
break;
case FOR_ASSIGNMENT: