From 6b91f12a38971d22d0e602bae236d7ffa953ea1f Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sun, 15 Dec 2013 18:55:53 +0100 Subject: mobile/gsm48_rr.c: Show "cipher 0", if ciphering is disabled Change-Id: Ic184772a57451d53797370d2cbac6653ec7b9847 --- src/host/layer23/src/mobile/gsm48_rr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 74dac749..1762f3df 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -3128,8 +3128,8 @@ static int gsm48_rr_activate_channel(struct osmocom_ms *ms, LOGP(DRR, LOGL_INFO, " Channel type %d, subch %d, ts %d, mode %d, " "audio-mode %d, cipher %d, tsc %d, ARFCN %s, hopping=%s\n", ch_type, ch_subch, ch_ts, cd->mode, rr->audio_mode, - rr->cipher_type + 1, cd->tsc, gsm_print_arfcn(cd->arfcn), - (cd->h) ? "yes":"no"); + (rr->cipher_on) ? rr->cipher_type + 1 : 0, cd->tsc, + gsm_print_arfcn(cd->arfcn), (cd->h) ? "yes":"no"); if (cd->h) l1ctl_tx_dm_est_req_h1(ms, cd->maio, cd->hsn, ma, ma_len, cd->chan_nr, cd->tsc, cd->mode, -- cgit v1.2.3