From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f176.google.com (mail-we0-f176.google.com [74.125.82.176]) by dpdk.org (Postfix) with ESMTP id 819C6B0BF for ; Mon, 19 May 2014 15:57:10 +0200 (CEST) Received: by mail-we0-f176.google.com with SMTP id q59so5446684wes.21 for ; Mon, 19 May 2014 06:57:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fHlnDRMUJE8BDUlBVBwQdZ0SW2XH93/MYlqne68Nfy4=; b=J1Pv/aPmdNvYsn2G4w0mZCviDLXkyfeb49xK00o1w+KCuX4O8ldnLE0I7/mrZVJFmp Ypqmgv5BUkrBlqfHLv+H0n4wPqPIn+oi44ZAJBRstxM59lJinYSAP5c2cXZVPU4BraPf AkpD5rQBLAQNf22pLLDijni0cCLFwK3r7K6cqISyCloN6tm4rIf7576A+Fz6TPnHLm+8 jyZf0hkTrZl8RyjCw7i7C6wWJP9q3cr9UwRZZEMRePgVAq2eKOnEiLu/7mTnrLnCtyHc mvGuO/qx6IiWb6LeX6KK/K35IhJ7nAenxd8rrWyGH1f2yjuMdDNN6Y+VjTlzh2P9BLVm nPHw== X-Gm-Message-State: ALoCoQlFK4V6LcM8vTndLwBlHD1/8bAaW+POEh3HHpalnit5wyztHhVYPoD13PZO/k2xJA4HvZUd X-Received: by 10.180.78.5 with SMTP id x5mr13463776wiw.12.1400507839498; Mon, 19 May 2014 06:57:19 -0700 (PDT) Received: from glumotte.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id t18sm15201828wiv.16.2014.05.19.06.57.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 May 2014 06:57:18 -0700 (PDT) From: Olivier Matz To: dev@dpdk.org Date: Mon, 19 May 2014 15:56:29 +0200 Message-Id: <1400507789-18453-18-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1400507789-18453-1-git-send-email-olivier.matz@6wind.com> References: <1400507789-18453-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [memnic PATCH v2 17/17] pmd: adapt to new rte_mbuf structure X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 May 2014 13:57:10 -0000 The rte_mbuf structure is modified by the following commits in dpdk: mbuf: rename vlan_macip_len in hw_offload and increase its size mbuf: change ol_flags to 32 bits mbuf: replace data pointer by an offset mbuf: merge physaddr and buf_len in a bitfield mbuf: remove the rte_pktmbuf structure mbuf: remove rte_ctrlmbuf We need to modify to conform to this new struct. Signed-off-by: Olivier Matz --- pmd/pmd_memnic.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pmd/pmd_memnic.c b/pmd/pmd_memnic.c index 4abdf26..0ea932e 100644 --- a/pmd/pmd_memnic.c +++ b/pmd/pmd_memnic.c @@ -277,11 +277,11 @@ static uint16_t memnic_recv_pkts(void *rx_queue, break; rte_memcpy(rte_pktmbuf_mtod(mb, void *), p->data, p->len); - mb->pkt.in_port = q->port_id; - mb->pkt.nb_segs = 1; - mb->pkt.next = NULL; - mb->pkt.pkt_len = p->len; - mb->pkt.data_len = p->len; + mb->in_port = q->port_id; + mb->nb_segs = 1; + mb->next = NULL; + mb->pkt_len = p->len; + mb->data_len = p->len; rx_pkts[nr] = mb; pkts++; @@ -363,9 +363,9 @@ retry: p->len = pkt_len; ptr = p->data; - for (sg = tx_pkts[nr]; sg; sg = sg->pkt.next) { + for (sg = tx_pkts[nr]; sg; sg = sg->next) { void *src = rte_pktmbuf_mtod(sg, void *); - int data_len = sg->pkt.data_len; + int data_len = sg->data_len; rte_memcpy(ptr, src, data_len); ptr += data_len; -- 1.9.2