From patchwork Thu Mar 26 19:23:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Kiss X-Patchwork-Id: 46389 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 245F921585 for ; Thu, 26 Mar 2015 19:25:19 +0000 (UTC) Received: by lahp7 with SMTP id p7sf7938136lah.0 for ; Thu, 26 Mar 2015 12:25:18 -0700 (PDT) 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:in-reply-to :references: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=q4ZqPB+bonwR9tgRLSzX2akavlRECyZvS+P+/uCVp8A=; b=FjVpXuCzIel22k+xOZ3GuKRaWQJm3B9cHSU7oZiJ0dLuybMEtlxSVh9vTdJGnGzsOf ygUnqFonS2VPkb8tjwMGZEnL4iVTpcu1FoiO8kZyGCjPethtBrHQ08jIvPt6oJyQeONp b/mkfbQ3FjNLGtVyqB13B8u8zREmQ/CREo/kOo4WdK7wV+XdspCINHGG2WwXzcsgd1TF Dt0XYksIfCIwnFxG78fv1PyiWEaraEt75z3VRe7nFeUfUOROLDfX768GgF8wl1tGDeQj fm5hWgynTQnIGZTssWXsoN5tkCRa1CJb4nnAww5eEFzM5jS0dJEpB5ll/sQ9ML89IFsU cEvw== X-Gm-Message-State: ALoCoQm9/QwLCaTQR6M1oPQoC1v0ED0N4oGYBJAiNTPKXQTe1GgS7GtAbJ0NVJQ/SeNUKz7G0CS0 X-Received: by 10.180.218.2 with SMTP id pc2mr2007560wic.0.1427397918064; Thu, 26 Mar 2015 12:25:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.45.98 with SMTP id l2ls251543lam.28.gmail; Thu, 26 Mar 2015 12:25:17 -0700 (PDT) X-Received: by 10.112.42.41 with SMTP id k9mr14724045lbl.90.1427397917897; Thu, 26 Mar 2015 12:25:17 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id t5si5331028laj.59.2015.03.26.12.25.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2015 12:25:17 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lagg8 with SMTP id g8so53838634lag.1 for ; Thu, 26 Mar 2015 12:25:17 -0700 (PDT) X-Received: by 10.152.43.51 with SMTP id t19mr14466217lal.73.1427397917794; Thu, 26 Mar 2015 12:25:17 -0700 (PDT) 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.57.201 with SMTP id k9csp814014lbq; Thu, 26 Mar 2015 12:25:17 -0700 (PDT) X-Received: by 10.140.104.142 with SMTP id a14mr15212452qgf.89.1427397915749; Thu, 26 Mar 2015 12:25:15 -0700 (PDT) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id 63si5868259qkw.108.2015.03.26.12.25.14 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 26 Mar 2015 12:25:15 -0700 (PDT) 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 1YbDOy-0000KM-RZ; Thu, 26 Mar 2015 19:25:12 +0000 Received: from mail-wg0-f48.google.com ([74.125.82.48]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YbDO2-0000AT-FD for lng-odp@lists.linaro.org; Thu, 26 Mar 2015 19:24:14 +0000 Received: by wgbcc7 with SMTP id cc7so74824729wgb.0 for ; Thu, 26 Mar 2015 12:24:09 -0700 (PDT) X-Received: by 10.194.133.101 with SMTP id pb5mr31975443wjb.40.1427397849114; Thu, 26 Mar 2015 12:24:09 -0700 (PDT) Received: from localhost.localdomain ([90.152.119.35]) by mx.google.com with ESMTPSA id kr5sm9708209wjc.1.2015.03.26.12.24.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Mar 2015 12:24:08 -0700 (PDT) From: Zoltan Kiss To: lng-odp@lists.linaro.org Date: Thu, 26 Mar 2015 19:23:55 +0000 Message-Id: <1427397836-27442-5-git-send-email-zoltan.kiss@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427397836-27442-1-git-send-email-zoltan.kiss@linaro.org> References: <1427397836-27442-1-git-send-email-zoltan.kiss@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v2 4/5] netdev-odp: rename odp_packet_* functions 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: zoltan.kiss@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.46 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: Zoltan Kiss --- lib/netdev-odp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/netdev-odp.c b/lib/netdev-odp.c index 2ab632e..f2fbb94 100644 --- a/lib/netdev-odp.c +++ b/lib/netdev-odp.c @@ -155,7 +155,7 @@ odp_class_init(void) VLOG_ERR("Error: packet allocation failed.\n"); return -1; } - start = (char *)odp_buffer_addr(odp_packet_to_buffer(pkts[i])); + start = (char *)odp_packet_data(pkts[i]); packet = (struct dpif_packet*) (start + SHM_PKT_POOL_BUF_SIZE); packet->ofpbuf.odp_pkt = pkts[i]; ofpbuf_init_odp(&packet->ofpbuf, SHM_PKT_POOL_BUF_SIZE); @@ -286,7 +286,7 @@ static int drop_err_pkts(odp_packet_t pkt_tbl[], unsigned len) for (i = 0, j = 0; i < len; ++i) { pkt = pkt_tbl[i]; - if (odp_unlikely(odp_packet_error(pkt))) { + if (odp_unlikely(odp_packet_has_error(pkt))) { odp_packet_free(pkt); /* Drop */ pkt_cnt--; } else if (odp_unlikely(i != j++)) { @@ -619,7 +619,7 @@ netdev_odp_rxq_recv(struct netdev_rxq *rxq_, struct dpif_packet **packets, /* Build the array of dpif_packet pointers */ for (i = 0; i < pkts_ok; i++) { char *start; - start = (char*)odp_buffer_addr(odp_packet_to_buffer(pkt_tbl[i])); + start = (char*)odp_packet_data(pkt_tbl[i]); packets[i] = (struct dpif_packet*) (start + SHM_PKT_POOL_BUF_SIZE); rx_bytes += odp_packet_len(pkt_tbl[i]); }