<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20699">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;">scheduler: join conditions in trx_sched_set_lchan()<br><br>Change-Id: If2b68e3c7bf01badaaa4666198a4a4c5709f0040<br>---<br>M src/common/scheduler.c<br>1 file changed, 8 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 8cb9bd4..5bf1c5b 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -1002,16 +1002,18 @@</span><br><span>                  chan_state->ul_bursts = NULL;</span><br><span>             }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           if (active)</span><br><span style="color: hsl(0, 100%, 40%);">-                     memset(chan_state, 0, sizeof(*chan_state));</span><br><span style="color: hsl(0, 100%, 40%);">-             else</span><br><span style="color: hsl(0, 100%, 40%);">-                    chan_state->ho_rach_detect = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-              chan_state->active = active;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>              if (active) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 /* Clean up everything */</span><br><span style="color: hsl(120, 100%, 40%);">+                     memset(chan_state, 0, sizeof(*chan_state));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+                 /* Bind to generic 'struct gsm_lchan' */</span><br><span>                     chan_state->lchan = get_lchan_by_chan_nr(l1t->trx, chan_nr);</span><br><span>                   OSMO_ASSERT(chan_state->lchan != NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+            } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                      chan_state->ho_rach_detect = 0;</span><br><span>           }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_state->active = active;</span><br><span>      }</span><br><span> </span><br><span>        /* disable handover detection (on deactivation) */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20699">change 20699</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-bts/+/20699"/><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-Change-Id: If2b68e3c7bf01badaaa4666198a4a4c5709f0040 </div>
<div style="display:none"> Gerrit-Change-Number: 20699 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@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-MessageType: merged </div>