<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20066">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis_rsl.c: flush channel request queue on RSL bootstrap<br><br>When RSL link is bootstrapped the BSC should clear the channel request<br>queue.<br><br>Change-Id: Iefb333817033e8d376184b58d89b186d875b968f<br>Related: OS#4549<br>---<br>M include/osmocom/bsc/abis_rsl.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>3 files changed, 16 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h</span><br><span>index 9879497..964e282 100644</span><br><span>--- a/include/osmocom/bsc/abis_rsl.h</span><br><span>+++ b/include/osmocom/bsc/abis_rsl.h</span><br><span>@@ -119,6 +119,7 @@</span><br><span> int rsl_tx_rf_chan_release(struct gsm_lchan *lchan);</span><br><span> </span><br><span> void abis_rsl_chan_rqd_queue_poll(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+void abis_rsl_chan_rqd_queue_flush(struct gsm_bts *bts);</span><br><span> </span><br><span> #endif /* RSL_MT_H */</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 74cc760..c0907c0 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -1398,6 +1398,18 @@</span><br><span>    }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Flush all channel requests pending on this BTS */</span><br><span style="color: hsl(120, 100%, 40%);">+void abis_rsl_chan_rqd_queue_flush(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  struct chan_rqd *rqd;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct chan_rqd *rqd_tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   llist_for_each_entry_safe(rqd, rqd_tmp, &bts->chan_rqd_queue, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+         llist_del(&rqd->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+                talloc_free(rqd);</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* MS has requested a channel on the RACH */</span><br><span> static int rsl_rx_chan_rqd(struct msgb *msg)</span><br><span> {</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 560f8fd..6d835ba 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -329,6 +329,9 @@</span><br><span>       /* Start CBCH transmit timer if CBCH is present */</span><br><span>   if (trx->nr == 0 && gsm_bts_get_cbch(trx->bts))</span><br><span>                bts_cbch_timer_schedule(trx->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       /* Drop all expired channel requests in the list */</span><br><span style="color: hsl(120, 100%, 40%);">+   abis_rsl_chan_rqd_queue_flush(trx->bts);</span><br><span> }</span><br><span> </span><br><span> static void all_ts_dispatch_event(struct gsm_bts_trx *trx, uint32_t event)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20066">change 20066</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/c/osmo-bsc/+/20066"/><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-Change-Id: Iefb333817033e8d376184b58d89b186d875b968f </div>
<div style="display:none"> Gerrit-Change-Number: 20066 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>