summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2013-12-15 18:55:53 +0100
committerHarald Welte <laforge@gnumonks.org>2019-05-23 13:03:46 +0200
commit6b91f12a38971d22d0e602bae236d7ffa953ea1f (patch)
treebaab68cc67af7b3c62301e716e3225b9520b1fee
parent46f2bdb91601e5c5ac34061a3e185704be8c3efa (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 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,