<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11406">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_validate_config(): Fix validation of rx_sps<br><br>Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022<br>Fixes: Coverity CID#188871<br>---<br>M CommonLibs/Logger.cpp<br>M Transceiver52M/osmo-trx.cpp<br>2 files changed, 2 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/06/11406/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp</span><br><span>index 171c635..cdf0544 100644</span><br><span>--- a/CommonLibs/Logger.cpp</span><br><span>+++ b/CommonLibs/Logger.cpp</span><br><span>@@ -52,7 +52,7 @@</span><br><span>   ScopedLock lock(gLogToLock);</span><br><span>         // The COUT() macro prevents messages from stomping each other but adds uninteresting thread numbers,</span><br><span>        // so just use std::cout.</span><br><span style="color: hsl(0, 100%, 40%);">-       LOGPSRC(mCategory, mPriority, filename, line, fmt, mStream.str().c_str());</span><br><span style="color: hsl(120, 100%, 40%);">+    //LOGPSRC(mCategory, mPriority, filename, line, fmt, mStream.str().c_str());</span><br><span>         pthread_setcancelstate(old_state, NULL);</span><br><span> }</span><br><span> </span><br><span>diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp</span><br><span>index d01a4cf..7f72c47 100644</span><br><span>--- a/Transceiver52M/osmo-trx.cpp</span><br><span>+++ b/Transceiver52M/osmo-trx.cpp</span><br><span>@@ -376,7 +376,7 @@</span><br><span> </span><br><span>         /* Force 4 SPS for EDGE or multi-ARFCN configurations */</span><br><span>     if ((trx->cfg.egprs || trx->cfg.multi_arfcn) &&</span><br><span style="color: hsl(0, 100%, 40%);">-       (trx->cfg.tx_sps!=4 || trx->cfg.tx_sps!=4)) {</span><br><span style="color: hsl(120, 100%, 40%);">+           (trx->cfg.tx_sps!=4 || trx->cfg.rx_sps!=4)) {</span><br><span>              LOG(ERROR) << "EDGE and Multi-Carrier options require 4 tx and rx sps. Check you config.";</span><br><span>           return -1;</span><br><span>   }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11406">change 11406</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/11406"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022 </div>
<div style="display:none"> Gerrit-Change-Number: 11406 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>