From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by dpdk.org (Postfix) with ESMTP id 993A89955 for ; Fri, 1 Sep 2017 10:08:03 +0200 (CEST) Received: by mail-wr0-f176.google.com with SMTP id k94so4565402wrc.0 for ; Fri, 01 Sep 2017 01:08:03 -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=pvA01Sog9YsYX+ExBY+5f97ZxgDvJpCiYRHdTQlp2mQ=; b=aATXJ0dUD+lTFOcQrdgKsWQ9N+HNgnOo/TKz2wD5EYk+JVaq7LTyBOMly1Tym8ZFwY d/+u1+UFDbn6Se+/hxEbSMUtqBNVWHUDp+zlmE6yd2m91nEwrpfHZk/Q3Uy2UBGJTrnK KvoL/Cd/2kJk+7MY7QyMl4wa3mriGcUyVI+6WSJ/QyFlVOdCQOESgPs/pOTkF4hQ20O0 sBjUjnjsMpA+oIsRno0Ve8X5PngBAzNBtAeVI9YihB8+KXlQZ0tG9sSbTo1Ob4c/7BQ2 kMAiKhvUmQDvvPhXPo8GU9jFDLpzGM2teV29DR1ZuJtVQ++L5hwKov5zXsilOiJxaUIT tSfw== 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=pvA01Sog9YsYX+ExBY+5f97ZxgDvJpCiYRHdTQlp2mQ=; b=QWz4gVAmoyMF+b16ee9uLHCGj0fHtthsB2499teUFXH4aaKk7ioaDL+Jmpr1kmMspC 5SGCCYoPfKjnuoQNPu6XfgYErjrprGNv93xNMu4UM/8cSpB0Ke1CQo6iJHY3rylXwYnA hzMF8BGWJAFxrnXq9CSfr3HcMSfwVYEje5q6PJRgz+eWX51yQs9VnZnx6rDE7gAgFZiB CMrEPFTZJBE9gclXBff2BScp97/gIa0CeAJEx1L+6vV4NKOLh+fzkIoSgzW3kY47mocT 0KWphztRZFhDRoFdS5vJeJ8SWxfBus5vZ9g3Zy+XnMrXpLNoZs1UM/XxNlgZLFDpe0/B Ls/g== X-Gm-Message-State: AHPjjUjKxGjkQaaUpi006aiWAsMNF2C1MWWfR/qjHqCLs7EiT3sfkdW7 CspILgMCRh5KdC0rvzY= X-Google-Smtp-Source: ADKCNb6lyHXFOD63yLe2m1jZmT1ia7ks/0NlfYPRtVT07KBlvUrK/V9wPbAZohPXb2GobzSH1yjiBA== X-Received: by 10.223.173.15 with SMTP id p15mr703567wrc.128.1504253283143; Fri, 01 Sep 2017 01:08:03 -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 l64sm2078248wmb.12.2017.09.01.01.08.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Sep 2017 01:08:01 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Fri, 1 Sep 2017 10:06:47 +0200 Message-Id: <32fac294956d6e269a2ac648bafda37710cd1c5c.1504252977.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 32/51] net/mlx4: remove mbuf macro definitions 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: , X-List-Received-Date: Fri, 01 Sep 2017 08:08:03 -0000 These were originally used for compatibility between DPDK releases when this PMD was built out of tree. Signed-off-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index e1efb8c..a94f27e 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -74,15 +74,6 @@ #include "mlx4.h" #include "mlx4_flow.h" -/* Convenience macros for accessing mbuf fields. */ -#define NEXT(m) ((m)->next) -#define DATA_LEN(m) ((m)->data_len) -#define PKT_LEN(m) ((m)->pkt_len) -#define DATA_OFF(m) ((m)->data_off) -#define SET_DATA_OFF(m, o) ((m)->data_off = (o)) -#define NB_SEGS(m) ((m)->nb_segs) -#define PORT(m) ((m)->port) - /** Configuration structure for device arguments. */ struct mlx4_conf { struct { @@ -995,7 +986,7 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) struct txq_elt *elt_next = &(*txq->elts)[elts_head_next]; struct txq_elt *elt = &(*txq->elts)[elts_head]; struct ibv_send_wr *wr = &elt->wr; - unsigned int segs = NB_SEGS(buf); + unsigned int segs = buf->nb_segs; unsigned int sent_size = 0; uint32_t send_flags = 0; @@ -1009,7 +1000,7 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) #endif /* Faster than rte_pktmbuf_free(). */ do { - struct rte_mbuf *next = NEXT(tmp); + struct rte_mbuf *next = tmp->next; rte_pktmbuf_free_seg(tmp); tmp = next; @@ -1029,7 +1020,7 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) /* Retrieve buffer information. */ addr = rte_pktmbuf_mtod(buf, uintptr_t); - length = DATA_LEN(buf); + length = buf->data_len; /* Retrieve Memory Region key for this memory pool. */ lkey = txq_mp2mr(txq, txq_mb2mp(buf)); if (unlikely(lkey == (uint32_t)-1)) { @@ -1385,7 +1376,7 @@ rxq_alloc_elts(struct rxq *rxq, unsigned int elts_n) wr->sg_list = sge; wr->num_sge = 1; /* Headroom is reserved by rte_pktmbuf_alloc(). */ - assert(DATA_OFF(buf) == RTE_PKTMBUF_HEADROOM); + assert(buf->data_off == RTE_PKTMBUF_HEADROOM); /* Buffer is supposed to be empty. */ assert(rte_pktmbuf_data_len(buf) == 0); assert(rte_pktmbuf_pkt_len(buf) == 0); @@ -1655,12 +1646,12 @@ mlx4_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) assert(elt->sge.lkey == rxq->mr->lkey); elt->buf = rep; /* Update seg information. */ - SET_DATA_OFF(seg, RTE_PKTMBUF_HEADROOM); - NB_SEGS(seg) = 1; - PORT(seg) = rxq->port_id; - NEXT(seg) = NULL; - PKT_LEN(seg) = len; - DATA_LEN(seg) = len; + seg->data_off = RTE_PKTMBUF_HEADROOM; + seg->nb_segs = 1; + seg->port = rxq->port_id; + seg->next = NULL; + seg->pkt_len = len; + seg->data_len = len; seg->packet_type = 0; seg->ol_flags = 0; /* Return packet. */ -- 2.1.4