From 5116420cb2c1f8ddc5e3ddf7831ac8fb2fb7b182 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 12 Nov 2011 23:37:07 +0100 Subject: [PATCH] Make sure we lookup trxmgr->ARFCN() with TRX number, not TS number --- public-trunk/GSM/OsmoLogicalChannel.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public-trunk/GSM/OsmoLogicalChannel.cpp b/public-trunk/GSM/OsmoLogicalChannel.cpp index 6aca974..0e0f968 100644 --- a/public-trunk/GSM/OsmoLogicalChannel.cpp +++ b/public-trunk/GSM/OsmoLogicalChannel.cpp @@ -36,8 +36,9 @@ using namespace GSM; ARFCNManager *OsmoTS::getARFCNmgr() { - TransceiverManager *trxmgr = getTRX()->getTRXmgr(); - return trxmgr->ARFCN(getTSnr()); + const OsmoTRX *trx = getTRX(); + TransceiverManager *trxmgr = trx->getTRXmgr(); + return trxmgr->ARFCN(trx->getTN()); } OsmoTS::OsmoTS(OsmoTRX &trx, unsigned int ts_nr, unsigned comb) @@ -49,7 +50,7 @@ OsmoTS::OsmoTS(OsmoTRX &trx, unsigned int ts_nr, unsigned comb) mNLchan = 0; TransceiverManager *trxmgr = trx.getTRXmgr(); - ARFCNManager *radio = trxmgr->ARFCN(ts_nr); + ARFCNManager *radio = trxmgr->ARFCN(trx.getTN()); radio->setSlot(ts_nr, comb); }