summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2013-12-15 18:55:53 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2015-12-25 09:33:08 +0100
commit6918c08d0cf511d1c984edea00795f1e669660d7 (patch)
tree0c993e57c3dbcbd6ce4dff2be2342e1d32b1f522
parent98a0c0bc0eb5ac029c65a1e8de337f25cbdc220c (diff)
mobile/gsm48_rr.c: Show "cipher 0", if ciphering is disabled
-rw-r--r--src/host/layer23/src/mobile/gsm48_rr.c4
1 files 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 067f96c0..eb1ffe27 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -3129,8 +3129,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,