Change in osmo-trx[master]: trx_validate_config(): Fix validation of rx_sps

2018-10-21 Thread Harald Welte 
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11406 )

Change subject: trx_validate_config(): Fix validation of rx_sps
..

trx_validate_config(): Fix validation of rx_sps

Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022
Fixes: Coverity CID#188871
---
M Transceiver52M/osmo-trx.cpp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index d01a4cf..7f72c47 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -376,7 +376,7 @@

/* Force 4 SPS for EDGE or multi-ARFCN configurations */
if ((trx->cfg.egprs || trx->cfg.multi_arfcn) &&
-   (trx->cfg.tx_sps!=4 || trx->cfg.tx_sps!=4)) {
+   (trx->cfg.tx_sps!=4 || trx->cfg.rx_sps!=4)) {
LOG(ERROR) << "EDGE and Multi-Carrier options require 4 tx and 
rx sps. Check you config.";
return -1;
}

--
To view, visit https://gerrit.osmocom.org/11406
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022
Gerrit-Change-Number: 11406
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Assignee: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Pau Espin Pedrol

Change in osmo-trx[master]: trx_validate_config(): Fix validation of rx_sps

2018-10-21 Thread Harald Welte 
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11406 )

Change subject: trx_validate_config(): Fix validation of rx_sps
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11406
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022
Gerrit-Change-Number: 11406
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Assignee: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Pau Espin Pedrol 
Gerrit-Comment-Date: Sun, 21 Oct 2018 11:49:00 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-trx[master]: trx_validate_config(): Fix validation of rx_sps

2018-10-21 Thread Harald Welte 
Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11406

to look at the new patch set (#2).

Change subject: trx_validate_config(): Fix validation of rx_sps
..

trx_validate_config(): Fix validation of rx_sps

Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022
Fixes: Coverity CID#188871
---
M Transceiver52M/osmo-trx.cpp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/06/11406/2
--
To view, visit https://gerrit.osmocom.org/11406
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022
Gerrit-Change-Number: 11406
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-trx[master]: trx_validate_config(): Fix validation of rx_sps

2018-10-21 Thread Harald Welte 
Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/11406


Change subject: trx_validate_config(): Fix validation of rx_sps
..

trx_validate_config(): Fix validation of rx_sps

Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022
Fixes: Coverity CID#188871
---
M CommonLibs/Logger.cpp
M Transceiver52M/osmo-trx.cpp
2 files changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/06/11406/1

diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp
index 171c635..cdf0544 100644
--- a/CommonLibs/Logger.cpp
+++ b/CommonLibs/Logger.cpp
@@ -52,7 +52,7 @@
ScopedLock lock(gLogToLock);
// The COUT() macro prevents messages from stomping each other but adds 
uninteresting thread numbers,
// so just use std::cout.
-   LOGPSRC(mCategory, mPriority, filename, line, fmt, 
mStream.str().c_str());
+   //LOGPSRC(mCategory, mPriority, filename, line, fmt, 
mStream.str().c_str());
pthread_setcancelstate(old_state, NULL);
 }

diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index d01a4cf..7f72c47 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -376,7 +376,7 @@

/* Force 4 SPS for EDGE or multi-ARFCN configurations */
if ((trx->cfg.egprs || trx->cfg.multi_arfcn) &&
-   (trx->cfg.tx_sps!=4 || trx->cfg.tx_sps!=4)) {
+   (trx->cfg.tx_sps!=4 || trx->cfg.rx_sps!=4)) {
LOG(ERROR) << "EDGE and Multi-Carrier options require 4 tx and 
rx sps. Check you config.";
return -1;
}

--
To view, visit https://gerrit.osmocom.org/11406
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e932cff59335add09c76caba6f9ac1e7cf69022
Gerrit-Change-Number: 11406
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte