From patchwork Fri Sep 1 08:06:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 28233 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id E7F628CF6; Fri, 1 Sep 2017 10:08:09 +0200 (CEST) Received: from mail-wr0-f181.google.com (mail-wr0-f181.google.com [209.85.128.181]) by dpdk.org (Postfix) with ESMTP id CC3AE995F for ; Fri, 1 Sep 2017 10:08:04 +0200 (CEST) Received: by mail-wr0-f181.google.com with SMTP id k94so4565544wrc.0 for ; Fri, 01 Sep 2017 01:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=06zExvkwyVKPOU2qzHyK2WvRqCwu7dP/8AgXFb3nvqE=; b=XSlrcnxWTqWZ90MWG8ZP5VItJwX1Atils/lz8PKmvuN0k/n41L4KmQZS5Z7bVEQSd4 Nb+g2ycoHzTWHvWhcdtVK/sYqHF/U25u2rSLXw4KTxfRSyQVMf4IwqrfAIXmxcf2w1IL UU3PU3EUWWCtMlV9bGl5/5tm8MVlF16kv519M5uQo8ruaEdYz9SaCrHEsWv7ytW4vGf/ n6ey2/yYBP28eAL+MzwAjISmiEQLysv7sWKaCLVzG5Ize9yF1BhniP3nmKHEkCiy+cgc P5EZD+9b+irBQxZpkB9AndE6g8iAYsUYtwz26U8nqM78nj/Kmvl5niMMHPnvnvUDV2eY gPeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=06zExvkwyVKPOU2qzHyK2WvRqCwu7dP/8AgXFb3nvqE=; b=t9OQbnXJfiCLz7lCG0rdwS4emKXnzEp4Ym/xnHnIEk18l7yypTN3kKGsg5urIoskX5 nJyORD5Z/axccGmSteqvsXUvlt6jfFZLTcLUkPT3oBHCdX6/YOvy6TfzY8blVjicBfZi q1tylSlzPBMEtwfkB8vCJfrKpPHfWW7RLtZf4dNFQD/04rZrRI7RFkyItdVGxsf46jNE t5UmZCnRkaBDDKfCe+BNtqctsCXCJ9HlqI0EG7db9tvXNk6uuFbTzyQNaDpmEY1Jf5L1 HGpvGSuFMmBijLCJB4lqy1ZwLyKxr6W4mjj2eQaUW/XDiaxL1/OxkpdvyhCE0FiJK95g MumA== X-Gm-Message-State: AHPjjUj3mGNm4GCsiMkKniw8a/yBQ9hGbZXHGD2XeI29UaKdrUdbcwP6 sV8fNWhb1xzR44XIGBA= X-Google-Smtp-Source: ADKCNb6MQEBNsqyvtjDYFZnQX5dmUCMVjYp6sXXvDdCttDb3GIJu0/jUOc0AHb4jaSfr1e1vrmKO4Q== X-Received: by 10.223.184.230 with SMTP id c35mr617988wrg.262.1504253284408; Fri, 01 Sep 2017 01:08:04 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 13sm2302981wms.22.2017.09.01.01.08.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Sep 2017 01:08:03 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Fri, 1 Sep 2017 10:06:48 +0200 Message-Id: <2addaf1532db6190e05e8ebe64452aa8470e49a5.1504252977.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 33/51] net/mlx4: use standard macro to get array size X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4.c | 11 ++++++----- drivers/net/mlx4/mlx4.h | 3 --- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index a94f27e..51259d2 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -66,6 +66,7 @@ #include #include #include +#include /* Generated configuration header. */ #include "mlx4_autoconf.h" @@ -633,7 +634,7 @@ txq_cleanup(struct txq *txq) claim_zero(ibv_destroy_qp(txq->qp)); if (txq->cq != NULL) claim_zero(ibv_destroy_cq(txq->cq)); - for (i = 0; (i != elemof(txq->mp2mr)); ++i) { + for (i = 0; (i != RTE_DIM(txq->mp2mr)); ++i) { if (txq->mp2mr[i].mp == NULL) break; assert(txq->mp2mr[i].mr != NULL); @@ -843,7 +844,7 @@ txq_mp2mr(struct txq *txq, struct rte_mempool *mp) unsigned int i; struct ibv_mr *mr; - for (i = 0; (i != elemof(txq->mp2mr)); ++i) { + for (i = 0; (i != RTE_DIM(txq->mp2mr)); ++i) { if (unlikely(txq->mp2mr[i].mp == NULL)) { /* Unknown MP, add a new MR for it. */ break; @@ -863,7 +864,7 @@ txq_mp2mr(struct txq *txq, struct rte_mempool *mp) (void *)txq); return (uint32_t)-1; } - if (unlikely(i == elemof(txq->mp2mr))) { + if (unlikely(i == RTE_DIM(txq->mp2mr))) { /* Table is full, remove oldest entry. */ DEBUG("%p: MR <-> MP table full, dropping oldest entry.", (void *)txq); @@ -1400,7 +1401,7 @@ rxq_alloc_elts(struct rxq *rxq, unsigned int elts_n) return 0; error: if (elts != NULL) { - for (i = 0; (i != elemof(*elts)); ++i) + for (i = 0; (i != RTE_DIM(*elts)); ++i) rte_pktmbuf_free_seg((*elts)[i].buf); rte_free(elts); } @@ -1427,7 +1428,7 @@ rxq_free_elts(struct rxq *rxq) rxq->elts = NULL; if (elts == NULL) return; - for (i = 0; (i != elemof(*elts)); ++i) + for (i = 0; (i != RTE_DIM(*elts)); ++i) rte_pktmbuf_free_seg((*elts)[i].buf); rte_free(elts); } diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index c840e27..e2990fe 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h @@ -98,9 +98,6 @@ enum { #define MLX4_DRIVER_NAME "net_mlx4" -/* Number of elements in array. */ -#define elemof(a) (sizeof(a) / sizeof((a)[0])) - /* Debugging */ #ifndef NDEBUG #include