<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17427">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;">l1sap: Use msgb_pull_l2() and unify l1sap_tch_ind + l1sap_ph_data_ind<br><br>In l1sap_ph_data_ind() we can use msgb_pull_l2() which is an exact<br>implementation of the functionality there.<br><br>In l1sap_tch_ind(), the existing code is actually wrong by making the<br>assumption that the msgb contains exactly an entire osmo_phsap_prim.<br>Better to also dynamically compute the number of bytes to ensure<br>we only pull those ahead of the L2 header, no matter what their exact<br>count.<br><br>Change-Id: I13f7f8ba93795e40b1fb4a306fe765e059f642cf<br>---<br>M src/common/l1sap.c<br>1 file changed, 2 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 05dbb6f..673430d 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -1355,8 +1355,7 @@</span><br><span>            l1sap_tx_ciph_req(lchan->ts->trx, chan_nr, 1, 0);</span><br><span> </span><br><span>  /* SDCCH, SACCH and FACCH all go to LAPDm */</span><br><span style="color: hsl(0, 100%, 40%);">-    msgb_pull(msg, (msg->l2h - msg->data));</span><br><span style="color: hsl(0, 100%, 40%);">-   msg->l1h = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+   msgb_pull_to_l2(msg);</span><br><span>        lapdm_phsap_up(&l1sap->oph, le);</span><br><span> </span><br><span>  /* don't free, because we forwarded data */</span><br><span>@@ -1393,7 +1392,7 @@</span><br><span>      if (gsm_bts_has_feature(trx->bts, BTS_FEAT_MEAS_PAYLOAD_COMB))</span><br><span>            process_l1sap_meas_data(trx, l1sap, PRIM_TCH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      msgb_pull(msg, sizeof(*l1sap));</span><br><span style="color: hsl(120, 100%, 40%);">+       msgb_pull_to_l2(msg);</span><br><span> </span><br><span>    /* Low level layers always call us when TCH content is expected, even if</span><br><span>      * the content is not available due to decoding issues. Content not</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/17427">change 17427</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/+/17427"/><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: I13f7f8ba93795e40b1fb4a306fe765e059f642cf </div>
<div style="display:none"> Gerrit-Change-Number: 17427 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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>