[MERGED] openbsc[master]: err log: tweak dyn pdch ack error logging

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: err log: tweak dyn pdch ack error logging
......................................................................


err log: tweak dyn pdch ack error logging

Rather use gsm_lchan_name().

Change-Id: I0334484eaa6a2c0f25925042c9c3c1a4e3e78ca4
---
M openbsc/src/libbsc/abis_rsl.c
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index a141a4b..9f76280 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -1233,18 +1233,18 @@
 	OSMO_ASSERT(ts->trx->bts);
 
 	if (lchan->ts->pchan != GSM_PCHAN_TCH_F_PDCH) {
-		LOGP(DRSL, LOGL_ERROR, "(bts %u, trx %u, ts %u, pchan %s)"
-		     " Rx PDCH %s ACK for channel that is no TCH/F_PDCH\n",
-		     ts->trx->bts->nr, ts->trx->nr, ts->nr,
+		LOGP(DRSL, LOGL_ERROR, "%s pchan=%s Rx PDCH %s ACK"
+		     " for channel that is no TCH/F_PDCH\n",
+		     gsm_lchan_name(lchan),
 		     gsm_pchan_name(ts->pchan),
 		     pdch_act? "ACT" : "DEACT");
 		return false;
 	}
 
 	if (lchan->state != LCHAN_S_NONE) {
-		LOGP(DRSL, LOGL_ERROR, "(bts %u, trx %u, ts %u, pchan %s)"
-		     " Rx PDCH %s ACK in unexpected state: %s\n",
-		     ts->trx->bts->nr, ts->trx->nr, ts->nr,
+		LOGP(DRSL, LOGL_ERROR, "%s pchan=%s Rx PDCH %s ACK"
+		     " in unexpected state: %s\n",
+		     gsm_lchan_name(lchan),
 		     gsm_pchan_name(ts->pchan),
 		     pdch_act? "ACT" : "DEACT",
 		     gsm_lchans_name(lchan->state));

-- 
To view, visit https://gerrit.osmocom.org/389
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0334484eaa6a2c0f25925042c9c3c1a4e3e78ca4
Gerrit-PatchSet: 2
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder