diff mbox

[5/5] LC15: properly initialize unmapped phy instances

Message ID 1458657612-12669-5-git-send-email-msuraev@sysmocom.de
State Accepted
Headers show

Commit Message

Max March 22, 2016, 2:40 p.m. UTC 
From: Max <msuraev@sysmocom.de>

Fixes: OS#1665
---
 src/osmo-bts-litecell15/l1_if.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Neels Hofmeyr March 22, 2016, 3:42 p.m. UTC | #1 
On Tue, Mar 22, 2016 at 03:40:12PM +0100, msuraev@sysmocom.de wrote:
> +		LOGP(DL1C, LOGL_NOTICE, "Ignoring phy link %d instance %d "
> +		     "because no TRX associated with it\n", plink->num, pinst->num);

"no TRX is associated" ?
        ^^
oh well, I'm starting to split hairs again.

~Neels
Harald Welte March 22, 2016, 6:41 p.m. UTC | #2 
Hi Max,

On Tue, Mar 22, 2016 at 03:40:12PM +0100, msuraev@sysmocom.de wrote:
> Fixes: OS#1665

thanks, applied.  Patches 3 and 4 out of the series remain up for
discussion.
diff mbox

Patch

diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index d810248..3ef2588 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -1388,6 +1388,11 @@  int bts_model_phy_link_open(struct phy_link *plink)
 
 	OSMO_ASSERT(pinst);
 
+	if (!pinst->trx) {
+		LOGP(DL1C, LOGL_NOTICE, "Ignoring phy link %d instance %d "
+		     "because no TRX associated with it\n", plink->num, pinst->num);
+		return 0;
+	}
 	phy_link_state_set(plink, PHY_LINK_CONNECTING);
 
 	pinst->u.lc15.hdl = l1if_open(pinst);
@@ -1399,5 +1404,7 @@  int bts_model_phy_link_open(struct phy_link *plink)
 	l1if_reset(pinst->u.lc15.hdl);
 
 	phy_link_state_set(plink, PHY_LINK_CONNECTED);
+
+	return 0;
 }