From patchwork Thu Jan 8 20:50:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 42891 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4CDA426CD8 for ; Thu, 8 Jan 2015 20:51:19 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id c13sf6408335eek.2 for ; Thu, 08 Jan 2015 12:51:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=KRs39jeDxEBKWxzU2eD1nfWfN0tcBX6WxlXDzhtwFVc=; b=EkUEd0u9VPCGtASWfINbUlPcXsATX4jCN82GKVi1UroL2srRCdLuxM5s8tlRbJww0o JxN5PBQR7EVSebORb19bR3r1wXB3BQVzkglG3x5+uVKUbY1LmHEio/rZLqi9YlvRvQxJ 1EPlH8kmeguaRn3k4XvG4xcUm2ukNhUXGjYhsATufHRap1SDYMYODA5G5mi3NAv7xTvb Ym3JVrWxbjAdiM0lUW8itKXuIYpzlWmlmBaG2mOjaSDCPuyyzA3vlEvhvYFSQhQe3jfb umJww9DvnPeZi/gJTmF3PdsTDtGAEWmpKEWjzwrAFpBgwiHOA1NGmyhipHqakhX+6xi1 krcQ== X-Gm-Message-State: ALoCoQn7ZUuaAAA9i8Ff2CdCEMQxLNm+EildVEqxQPvQJAcmIyjY+tS7dWMzAIaedgY8NtwMugNX X-Received: by 10.180.76.40 with SMTP id h8mr3984658wiw.3.1420750278462; Thu, 08 Jan 2015 12:51:18 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.170 with SMTP id p10ls373276lal.35.gmail; Thu, 08 Jan 2015 12:51:18 -0800 (PST) X-Received: by 10.152.88.44 with SMTP id bd12mr17281092lab.88.1420750278133; Thu, 08 Jan 2015 12:51:18 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id b5si10729819laa.32.2015.01.08.12.51.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Jan 2015 12:51:17 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id gd6so11390377lab.3 for ; Thu, 08 Jan 2015 12:51:17 -0800 (PST) X-Received: by 10.152.43.103 with SMTP id v7mr17600422lal.29.1420750277672; Thu, 08 Jan 2015 12:51:17 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp124361lbb; Thu, 8 Jan 2015 12:51:16 -0800 (PST) X-Received: by 10.224.43.202 with SMTP id x10mr19439960qae.16.1420750276351; Thu, 08 Jan 2015 12:51:16 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id u3si8658908qat.59.2015.01.08.12.51.15 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 08 Jan 2015 12:51:16 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Y9K2y-0004FA-Dc; Thu, 08 Jan 2015 20:51:12 +0000 Received: from mail-qg0-f45.google.com ([209.85.192.45]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Y9K2s-0004Cw-0g for lng-odp@lists.linaro.org; Thu, 08 Jan 2015 20:51:06 +0000 Received: by mail-qg0-f45.google.com with SMTP id z107so4740421qgd.4 for ; Thu, 08 Jan 2015 12:51:00 -0800 (PST) X-Received: by 10.224.50.209 with SMTP id a17mr9846977qag.96.1420750260732; Thu, 08 Jan 2015 12:51:00 -0800 (PST) Received: from localhost.localdomain ([98.221.136.245]) by mx.google.com with ESMTPSA id q20sm4150229qak.28.2015.01.08.12.50.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Jan 2015 12:51:00 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Thu, 8 Jan 2015 15:50:46 -0500 Message-Id: <1420750246-19697-1-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.1.0 X-Topics: crypto patch Subject: [lng-odp] [PATCH] linux-generic: crypto: swap abort -> ODP_ABORT X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: 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-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mike.holmes@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Mike Holmes Reviewed-by: Bill Fischofer --- platform/linux-generic/odp_crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 13c5556..2f95cbe 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -361,7 +361,7 @@ odp_crypto_operation(odp_crypto_op_params_t *params, odp_buffer_alloc(session->output_pool); if (params->pkt != params->out_pkt) { if (odp_unlikely(ODP_PACKET_INVALID == params->out_pkt)) - abort(); + ODP_ABORT(); _odp_packet_copy_to_packet(params->pkt, 0, params->out_pkt, 0, odp_packet_len(params->pkt)); if (completion_event == odp_packet_to_buffer(params->pkt)) @@ -440,7 +440,7 @@ odp_crypto_get_operation_compl_status(odp_buffer_t completion_event, result = get_op_result_from_buffer(completion_event); if (OP_RESULT_MAGIC != result->magic) - abort(); + ODP_ABORT(); memcpy(auth, &result->auth, sizeof(*auth)); memcpy(cipher, &result->cipher, sizeof(*cipher));