<p>Keith Whyte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10864">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Feed the actual pchan type to bts_supports_cm()<br><br>In rsl_rx_mode_modif(), bts_supports_cm() should never<br>be fed with dynamic pchan kinds.<br>Feed instead the return value of ts_pchan() that is to say,<br>the actual pchan type.<br><br>Change-Id: I7f0c835b25289931bccf96e982ea5564c8be4192<br>---<br>M src/common/bts.c<br>M src/common/rsl.c<br>2 files changed, 5 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/10864/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index bec611c..55b7fa7 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -731,6 +731,8 @@</span><br><span>                         /* Invalid speech codec type => Not supported! */</span><br><span>                         return 0;</span><br><span>            }</span><br><span style="color: hsl(120, 100%, 40%);">+     } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGP(DRSL, LOGL_DEBUG, "%s: Invalid pchan(%s)\n", __func__, gsm_pchan_name(pchan));</span><br><span>        }</span><br><span> </span><br><span>        /* Check if the feature is supported by this BTS */</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index c6c00ea..451b54e 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1498,8 +1498,9 @@</span><br><span>     cm = (struct rsl_ie_chan_mode *) TLVP_VAL(&tp, RSL_IE_CHAN_MODE);</span><br><span>        lchan_tchmode_from_cmode(lchan, cm);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        if (bts_supports_cm(lchan->ts->trx->bts, lchan->ts->pchan, lchan->tch_mode) != 1) {</span><br><span style="color: hsl(0, 100%, 40%);">-           LOGP(DRSL, LOGL_ERROR, "invalid mode/codec instructed by BSC, check BSC configuration.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_supports_cm(lchan->ts->trx->bts, ts_pchan(lchan->ts), lchan->tch_mode) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGP(DRSL, LOGL_ERROR, "BTS %d: invalid mode(%s)/codec(%s) instructed by BSC, check BSC configuration.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                  lchan->ts->trx->bts->nr, gsm_pchan_name(lchan->ts->pchan), gsm48_chan_mode_name(lchan->tch_mode));</span><br><span>              return rsl_tx_mode_modif_nack(lchan, RSL_ERR_SERV_OPT_UNAVAIL);</span><br><span>      }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10864">change 10864</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10864"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7f0c835b25289931bccf96e982ea5564c8be4192 </div>
<div style="display:none"> Gerrit-Change-Number: 10864 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Keith Whyte <keith@rhizomatica.org> </div>