<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/26527">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">oml: fix copy-pasted comments in oml_rx_set_*_attr()<br><br>Change-Id: Iaa0e630b28b2a86312c069e7e55dd8bc5743759a<br>---<br>M src/common/oml.c<br>1 file changed, 4 insertions(+), 4 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/27/26527/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index 4e09008..c8819c9 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -735,7 +735,7 @@</span><br><span>                 return oml_fom_ack_nack(msg, NM_NACK_INCORR_STRUCT);</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* merge existing BTS attributes with new attributes */</span><br><span style="color: hsl(120, 100%, 40%);">+       /* merge existing TRX attributes with new attributes */</span><br><span>      tp_merged = osmo_tlvp_copy(trx->mo.nm_attr, trx);</span><br><span>         osmo_tlvp_merge(tp_merged, &tp);</span><br><span> </span><br><span>@@ -746,7 +746,7 @@</span><br><span>               return oml_fom_ack_nack(msg, -rc);</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* Success: replace old BTS attributes with new */</span><br><span style="color: hsl(120, 100%, 40%);">+    /* Success: replace old TRX attributes with new */</span><br><span>   talloc_free(trx->mo.nm_attr);</span><br><span>     trx->mo.nm_attr = tp_merged;</span><br><span> </span><br><span>@@ -949,7 +949,7 @@</span><br><span>            return oml_fom_ack_nack(msg, NM_NACK_SPEC_IMPL_NOTSUPP);</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* merge existing BTS attributes with new attributes */</span><br><span style="color: hsl(120, 100%, 40%);">+       /* merge existing CHAN attributes with new attributes */</span><br><span>     tp_merged = osmo_tlvp_copy(ts->mo.nm_attr, ts->trx);</span><br><span>   osmo_tlvp_merge(tp_merged, &tp);</span><br><span> </span><br><span>@@ -962,7 +962,7 @@</span><br><span>               return oml_fom_ack_nack(msg, -rc);</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* Success: replace old BTS attributes with new */</span><br><span style="color: hsl(120, 100%, 40%);">+    /* Success: replace old CHAN attributes with new */</span><br><span>  talloc_free(ts->mo.nm_attr);</span><br><span>      ts->mo.nm_attr = tp_merged;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/26527">change 26527</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/+/26527"/><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: Iaa0e630b28b2a86312c069e7e55dd8bc5743759a </div>
<div style="display:none"> Gerrit-Change-Number: 26527 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>