From patchwork Wed May 25 23:36:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 68649 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp111310qge; Wed, 25 May 2016 16:38:08 -0700 (PDT) X-Received: by 10.55.132.3 with SMTP id g3mr6510979qkd.126.1464219488758; Wed, 25 May 2016 16:38:08 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id h123si10561506qkd.147.2016.05.25.16.38.08; Wed, 25 May 2016 16:38:08 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 57D1E617E3; Wed, 25 May 2016 23:38:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id ED8B461807; Wed, 25 May 2016 23:37:24 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D5EF6617FD; Wed, 25 May 2016 23:37:21 +0000 (UTC) Received: from mail-oi0-f41.google.com (mail-oi0-f41.google.com [209.85.218.41]) by lists.linaro.org (Postfix) with ESMTPS id 1B50D617EA for ; Wed, 25 May 2016 23:37:15 +0000 (UTC) Received: by mail-oi0-f41.google.com with SMTP id k23so99586231oih.0 for ; Wed, 25 May 2016 16:37:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IUSYDO/fnFLZD8Chn+DfSjKDdNVYhe4Sv4+b/yC4scs=; b=KBVCFd9s/MR/hzadkOZPi20boRQT6fWyUgLKSytaFKLc5RO4fthyOZKUSwC6Y9IvRY 8Fw4u6JDXB9+brPRs51ZqrFwvEs30XgmVUuy25gnL5wNKERDrPT5SDVgYezC+WvlWvYC VLuyoF/mc6vFbh2bkywqs/jrC/s5dsgn3jrrwbuHgj7LtNkE4kS/i8DSNFLNOFsYhkDg edopEsMKZingDGxkjgzD9UkTbG5GkX/v4ybiYXuccVFJaTAmSstbES1omWQ8qqcewZ19 VdEfvU8J/ZlI2b4AIZF53bcF4TXPU4f0xkmJLnDHdwcmN/7XQQ8ErxYBKPoxtQK0H36S 6HOw== X-Gm-Message-State: ALyK8tK/TwI2sa+SUrFfYzKizfC4wTLMZGrdvw22lp3sBcHKHtnya6XMfMdtqTBMwBjX/egYFRA= X-Received: by 10.202.245.140 with SMTP id t134mr4127654oih.92.1464219434565; Wed, 25 May 2016 16:37:14 -0700 (PDT) Received: from localhost.localdomain (cpe-66-68-129-43.austin.res.rr.com. [66.68.129.43]) by smtp.gmail.com with ESMTPSA id l65sm5103562otc.28.2016.05.25.16.37.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 May 2016 16:37:14 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Wed, 25 May 2016 18:36:57 -0500 Message-Id: <1464219423-14977-5-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464219423-14977-1-git-send-email-bill.fischofer@linaro.org> References: <1464219423-14977-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 04/10] validation: tm: handle pktio open/config failures properly X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Add proper sequencing of checks for pktio open / configure failures. Signed-off-by: Bill Fischofer --- test/validation/traffic_mngr/traffic_mngr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/validation/traffic_mngr/traffic_mngr.c index 2bbcc1d..e099083 100644 --- a/test/validation/traffic_mngr/traffic_mngr.c +++ b/test/validation/traffic_mngr/traffic_mngr.c @@ -492,19 +492,19 @@ static int open_pktios(void) &pktio_param); if (pktio == ODP_PKTIO_INVALID) pktio = odp_pktio_lookup(iface_name[iface]); + if (pktio == ODP_PKTIO_INVALID) { + LOG_ERR("odp_pktio_open() failed\n"); + return -1; + } /* Set defaults for PktIn and PktOut queues */ - odp_pktin_queue_config(pktio, NULL); - odp_pktout_queue_config(pktio, NULL); + (void)odp_pktin_queue_config(pktio, NULL); + (void)odp_pktout_queue_config(pktio, NULL); rc = odp_pktio_promisc_mode_set(pktio, true); if (rc != 0) printf("****** promisc_mode_set failed ******\n"); pktios[iface] = pktio; - if (pktio == ODP_PKTIO_INVALID) { - LOG_ERR("odp_pktio_open() failed\n"); - return -1; - } if (odp_pktin_queue(pktio, &pktins[iface], 1) != 1) { odp_pktio_close(pktio);