3 files changed, 4 insertions, 30 deletions
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
index 6235bfdb..b1fc41ad 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
@@ -210,6 +210,5 @@ int gsm48_rr_start_monitor(struct osmocom_ms *ms);
 int gsm48_rr_stop_monitor(struct osmocom_ms *ms);
 int gsm48_rr_alter_delay(struct osmocom_ms *ms);
 int gsm48_rr_tx_voice(struct osmocom_ms *ms, struct msgb *msg);
-int gsm48_rr_audio_mode(struct osmocom_ms *ms, uint8_t mode);
 
 #endif /* _GSM48_RR_H */
diff --git a/src/host/layer23/src/mobile/gsm48_cc.c b/src/host/layer23/src/mobile/gsm48_cc.c
index 29f1ba1c..1d37ebea 100644
--- a/src/host/layer23/src/mobile/gsm48_cc.c
+++ b/src/host/layer23/src/mobile/gsm48_cc.c
@@ -1974,17 +1974,13 @@ int mncc_tx_to_cc(void *inst, int msg_type, void *arg)
 	case GSM_TCHH_FRAME:
 	case GSM_TCH_FRAME_AMR:
 		return gsm_send_voice_mncc(ms, arg);
+
+	/* Intentionally ignored messages */
 	case MNCC_LCHAN_MODIFY:
-		return 0;
 	case MNCC_FRAME_RECV:
-		ms->mncc_entity.ref = trans->callref;
-		gsm48_rr_audio_mode(ms,
-			AUDIO_TX_TRAFFIC_REQ | AUDIO_RX_TRAFFIC_IND);
-		return 0;
 	case MNCC_FRAME_DROP:
-		if (ms->mncc_entity.ref == trans->callref)
-			ms->mncc_entity.ref = 0;
-		gsm48_rr_audio_mode(ms, AUDIO_TX_MICROPHONE | AUDIO_RX_SPEAKER);
+		LOGP(DCC, LOGL_NOTICE, "Ignoring MNCC message %s\n",
+			get_mncc_name(msg_type));
 		return 0;
 	}
 
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c
index bed1e47d..18254c23 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -5683,24 +5683,3 @@ int gsm48_rr_tx_voice(struct osmocom_ms *ms, struct msgb *msg)
 
 	return l1ctl_tx_traffic_req(ms, msg, rr->cd_now.chan_nr, 0);
 }
-
-int gsm48_rr_audio_mode(struct osmocom_ms *ms, uint8_t mode)
-{
-	struct gsm48_rrlayer *rr = &ms->rrlayer;
-	uint8_t ch_type, ch_subch, ch_ts;
-
-	LOGP(DRR, LOGL_INFO, "setting audio mode to %d\n", mode);
-
-	rr->audio_mode = mode;
-
-	if (!rr->dm_est)
-		return 0;
-
-	rsl_dec_chan_nr(rr->cd_now.chan_nr, &ch_type, &ch_subch, &ch_ts);
-	if (ch_type != RSL_CHAN_Bm_ACCHs
-	 && ch_type != RSL_CHAN_Lm_ACCHs)
-		return 0;
-
-	return l1ctl_tx_tch_mode_req(ms, rr->cd_now.mode, mode);
-}
-