<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11987">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested<br><br>If BTS is configured to have only TCH/F_PDCH and TCH/H and a call is<br>resolved to require TCH/F, don't return the TCH/H which have no use, but<br>instead let it allocate the TCH/F_PDCH.<br><br>20181128185013783 DRLL <0000> lchan_select.c:159 (bts=0) lchan_select_by_type(TCH_F)<br>20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=0,pchan=CCCH+SDCCH4,state=IN_USE) is != TCH/F<br>20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=1,pchan=SDCCH8,state=UNUSED) is != TCH/F<br>20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=2,pchan=TCH/H,state=UNUSED) is != TCH/F<br>20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=3,pchan=TCH/H,state=UNUSED) is != TCH/F<br>20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=4,pchan=TCH/H,state=UNUSED) is != TCH/F<br>20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=5,pchan=TCH/H,state=UNUSED) is != TCH/F<br>20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=6,pchan_on_init=TCH/F_PDCH,pchan=PDCH,state=PDCH) is != TCH/F<br>20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=7,pchan_on_init=TCH/F_PDCH,pchan=PDCH,state=PDCH) is != TCH/F<br>20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/H: (bts=0,trx=0,ts=0,pchan=CCCH+SDCCH4,state=IN_USE) is != TCH/H<br>20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/H: (bts=0,trx=0,ts=1,pchan=SDCCH8,state=UNUSED) is != TCH/H<br>20181128185013784 DRLL <0000> lchan_select.c:86 looking for lchan TCH/H: (bts=0,trx=0,ts=2,pchan=TCH/H,state=UNUSED) ss=0 is available<br>20181128185013784 DCHAN <0010> lchan_select.c:253 lchan(0-0-2-TCH_H-0)[0x6120000066a0]{UNUSED}: (type=TCH_H) Selected<br><br>Change-Id: I9a73beb0432fab16d5430e5b40d470694e09b189<br>---<br>M src/osmo-bsc/lchan_select.c<br>1 file changed, 1 insertion(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c</span><br><span>index 742c7de..f70ad4a 100644</span><br><span>--- a/src/osmo-bsc/lchan_select.c</span><br><span>+++ b/src/osmo-bsc/lchan_select.c</span><br><span>@@ -182,13 +182,7 @@</span><br><span> break;</span><br><span> case GSM_LCHAN_TCH_F:</span><br><span> lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F);</span><br><span style="color: hsl(0, 100%, 40%);">- /* If we don't have TCH/F available, fall-back to TCH/H */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_H);</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan)</span><br><span style="color: hsl(0, 100%, 40%);">- type = GSM_LCHAN_TCH_H;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* If we don't have TCH/H either, try dynamic TCH/F_PDCH */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If we don't have TCH/F available, try dynamic TCH/F_PDCH */</span><br><span> if (!lchan) {</span><br><span> lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH,</span><br><span> GSM_PCHAN_TCH_F);</span><br><span>@@ -206,14 +200,6 @@</span><br><span> if (lchan)</span><br><span> type = GSM_LCHAN_TCH_F;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* ...and as TCH/H. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = _lc_dyn_find_bts(bts,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM_PCHAN_TCH_F_TCH_H_PDCH,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM_PCHAN_TCH_H);</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan)</span><br><span style="color: hsl(0, 100%, 40%);">- type = GSM_LCHAN_TCH_H;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> break;</span><br><span> case GSM_LCHAN_TCH_H:</span><br><span> lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_H);</span><br><span>@@ -257,4 +243,3 @@</span><br><span> </span><br><span> return lchan;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11987">change 11987</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/11987"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I9a73beb0432fab16d5430e5b40d470694e09b189 </div>
<div style="display:none"> Gerrit-Change-Number: 11987 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Vadim Yanitskiy <axilirator@gmail.com> </div>