From patchwork Tue Mar 22 14:40:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max X-Patchwork-Id: 600846 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.osmocom.org (lists.osmocom.org [IPv6:2a01:4f8:191:444b::2:7]) by ozlabs.org (Postfix) with ESMTP id 3qTwN61d8Nz9s2Q for ; Wed, 23 Mar 2016 01:40:22 +1100 (AEDT) Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id C074E1C1E4; Tue, 22 Mar 2016 14:40:20 +0000 (UTC) X-Original-To: openbsc@lists.osmocom.org Delivered-To: openbsc@lists.osmocom.org Received: from mail.sysmocom.de (mail.sysmocom.de [IPv6:2a01:4f8:191:444c::2:4]) by lists.osmocom.org (Postfix) with ESMTP id C56561C1C3 for ; Tue, 22 Mar 2016 14:40:18 +0000 (UTC) Received: from mail.sysmocom.de (mail.sysmocom.de [144.76.43.93]) by mail.sysmocom.de (Postfix) with ESMTP id A2E4C188990; Tue, 22 Mar 2016 14:40:18 +0000 (UTC) Received: from pbell.local (ip5b418565.dynamic.kabel-deutschland.de [91.65.133.101]) by mail.sysmocom.de (Postfix) with ESMTPSA id 6A13918898F; Tue, 22 Mar 2016 14:40:18 +0000 (UTC) From: msuraev@sysmocom.de To: openbsc@lists.osmocom.org Subject: [PATCH 5/5] LC15: properly initialize unmapped phy instances Date: Tue, 22 Mar 2016 15:40:12 +0100 Message-Id: <1458657612-12669-5-git-send-email-msuraev@sysmocom.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1458657612-12669-1-git-send-email-msuraev@sysmocom.de> References: <1458657612-12669-1-git-send-email-msuraev@sysmocom.de> X-Virus-Scanned: ClamAV using ClamSMTP X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Development of OpenBSC, OsmoBSC, OsmoNITB, OsmoCSCN" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Errors-To: openbsc-bounces@lists.osmocom.org Sender: "OpenBSC" From: Max Fixes: OS#1665 --- src/osmo-bts-litecell15/l1_if.c | 7 +++++++ 1 file changed, 7 insertions(+) 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; }