From patchwork Tue Aug 1 16:54:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 27348 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 678C9A248; Tue, 1 Aug 2017 18:56:05 +0200 (CEST) Received: from mail-wr0-f172.google.com (mail-wr0-f172.google.com [209.85.128.172]) by dpdk.org (Postfix) with ESMTP id F397FA0EE for ; Tue, 1 Aug 2017 18:55:36 +0200 (CEST) Received: by mail-wr0-f172.google.com with SMTP id v105so9278760wrb.0 for ; Tue, 01 Aug 2017 09:55:36 -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=vH7mNoWu/LG8XWgDk1t7IzHDc0sZ7gWKvNqIs402lfk=; b=lX2aM6QUq/v1IdKvRtl0zAX4VbjdPpGvZfbHagls+fiAhzuSFGEpO78Rx16d81WtMR UJPOwXc8A2e6WRfwLdgWkplX5KhJk0EiYRBMCYQRT8F5ujy/WPMHWuspI35tJGFQxkre I5EHi3I5eT5edXsMG4BU9/DTKfi5Ax9JuArc/yQ9nUUcXLUPtDq/FiHyVot8UXrvc+np xj/2zoIaI9Y33KRd7Da4Khpd7zTTmI+BcSjJkPK2bB2W1sujgwfYl4gWYT59mb8hwl1m yT6U4vsGAM3RA3LIxFBZQz67Pv3xWhonRj0WY3DFRdwKNGJq9p+cGZJZa6oHZB4cBR1I G1jA== 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=vH7mNoWu/LG8XWgDk1t7IzHDc0sZ7gWKvNqIs402lfk=; b=C7omH5zkM9S6d1qgYFNC6BjbQvoNGfsruR0K6hsNsrm8Vb3OE9ehptA5qyHkm+T9C0 rSKeWbBuGT9I/HvW/qtDJFpRwGKibw4/231TiJYuIcIUMpJQUS3mMuv0g3mVY4u+Dyuj SDnRdPSzA7R2PYxjIGmamRnAqXe1FliFp2KCx0p/yp/ts+PBN4I9yneo9OpjHTmpq0Ji /FMgfzT49/PAYX6Y716ydazFKaFr3vlqP1J6ZfA369bV1h/Wn4esy4qh8Y/Cozv0zzue 6SYyv/1664jQUrqz4vENxmwXUY2SY9FesPVxu1IL8ZkdnaW+akqAJ3/rKDDyJapBpQ48 aReQ== X-Gm-Message-State: AIVw110GxrKet8JemnI2N476QV1Ioj+YR0ArB0ehk7RGnRL2nEtt5C/d lGlyz5+i5IszSBeeWlc= X-Received: by 10.223.176.57 with SMTP id f54mr11527697wra.194.1501606536340; Tue, 01 Aug 2017 09:55:36 -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 e1sm40769935wrc.91.2017.08.01.09.55.35 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 01 Aug 2017 09:55:35 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Tue, 1 Aug 2017 18:54:19 +0200 Message-Id: <16f873572fd62f62240083b7c6e4350a5642f0eb.1501598384.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 32/48] 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 0f1169c..f4dc67f 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" @@ -644,7 +645,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); @@ -854,7 +855,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; @@ -874,7 +875,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); @@ -1444,7 +1445,7 @@ rxq_alloc_elts(struct rxq *rxq, unsigned int elts_n, struct rte_mbuf **pool) error: if (elts != NULL) { assert(pool == NULL); - for (i = 0; (i != elemof(*elts)); ++i) { + for (i = 0; (i != RTE_DIM(*elts)); ++i) { struct rxq_elt *elt = &(*elts)[i]; struct rte_mbuf *buf; @@ -1480,7 +1481,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) { struct rxq_elt *elt = &(*elts)[i]; struct rte_mbuf *buf; diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index 3580e05..7ec6317 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