From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by dpdk.org (Postfix) with ESMTP id 2A2944C99 for ; Tue, 25 Sep 2018 09:05:14 +0200 (CEST) Received: by mail-lf1-f65.google.com with SMTP id g24-v6so18967293lfb.11 for ; Tue, 25 Sep 2018 00:05:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RzBx392L0hF8D4rAGqU6sZeg0TS6te3aaebQnZBNPEA=; b=CRcUnLu4S4jLS4llXfPZlW6XqF78JYGvsWZUlFRZpsUg4qh+cz+AUlks8J7tucQ7I8 jXNfS34RJALgUT5vy0I04th6QVGPwUR+TEx1arnQJNS+Xvtzu291FT8u6KPr1U+WV6CC TBN3wTHncz6sz7tvvhLcYI/TL45FKO/xpmbqkI8mCu2149qFU2KP8sZf57YI/+FzeB/L sEHSB8jbdfH62ANXYULwC+mQoONyz3nFtkF9Zzgesh6HNMP2lsR6c2epwdtyVTR9q8S2 HLvftYnT9IFsb0l/MGgRx7mAtzgDJ//P+pNj4D+rN/EpWNciNbs5tTMdlUJFDFdZuLk/ 72UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RzBx392L0hF8D4rAGqU6sZeg0TS6te3aaebQnZBNPEA=; b=meJ6wc3PTg8Du+oB2A6ACBEtkfsBeRLyKGHUI5nJ78k6T/3+YHiWT/KOboCxtojB+O b6DdaFkQztaBCfo58kcaRdexnEzxvouCgal1DS1TABw5p/xJKLHU8A1ZPf2BdsmWFzzw VRyX/nIPj19ovJkzUvkJZf7p54d36WMtsj2TfZe/c0U6jaPJvVZKZiVQtbYEW+yA7jV3 4WpWGktq9ggQk1xyBadfxamQvNmlLf5efTQQ4FWEkED66yDhwkFSA2YcBW+R89nMzsQ0 /z+QGakoERIoxLSZ9MnH25gvLJJJO6lNg05B2yPeQg9MT+HHMMFfCmXywES2ZGZx97fK 4wWg== X-Gm-Message-State: ABuFfogsmw+0dkC1HJrJQgiY4UeTJTAu92HMfekO6BS1Bw5wsybVeEcX tc1FrsKq4llO+edw+u/JhyrI2V27mHnmEg== X-Google-Smtp-Source: ACcGV60r+EpYC5QG600ZWchzEJqoey6Xlo40ljjjxP0tscnrCuQHRYWVD4a3pOMffZFm1X0FHk37sw== X-Received: by 2002:a19:5e5d:: with SMTP id z29-v6mr1443770lfi.110.1537859113513; Tue, 25 Sep 2018 00:05:13 -0700 (PDT) Received: from amok.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.googlemail.com with ESMTPSA id 24-v6sm238306ljb.76.2018.09.25.00.05.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Sep 2018 00:05:12 -0700 (PDT) From: Andrzej Ostruszka To: dev@dpdk.org Cc: mw@semihalf.com, nadavh@marvell.com, Tomasz Duszynski , Natalie Samsonov Date: Tue, 25 Sep 2018 09:04:58 +0200 Message-Id: <1537859109-25659-3-git-send-email-amo@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537859109-25659-1-git-send-email-amo@semihalf.com> References: <1536068953-9352-1-git-send-email-tdu@semihalf.com> <1537859109-25659-1-git-send-email-amo@semihalf.com> Subject: [dpdk-dev] [PATCH v3 02/13] net/mvpp2: move common code 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: Tue, 25 Sep 2018 07:05:14 -0000 From: Tomasz Duszynski Cleanup sources by moving common code to the pmd header file. Signed-off-by: Tomasz Duszynski Signed-off-by: Natalie Samsonov Reviewed-by: Liron Himi --- drivers/net/mvpp2/mrvl_ethdev.c | 9 --------- drivers/net/mvpp2/mrvl_ethdev.h | 11 +++++++++++ drivers/net/mvpp2/mrvl_flow.c | 5 ----- drivers/net/mvpp2/mrvl_qos.c | 9 --------- 4 files changed, 11 insertions(+), 23 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index dca3ccc..c8c8548 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -10,15 +10,6 @@ #include #include -/* Unluckily, container_of is defined by both DPDK and MUSDK, - * we'll declare only one version. - * - * Note that it is not used in this PMD anyway. - */ -#ifdef container_of -#undef container_of -#endif - #include #include #include diff --git a/drivers/net/mvpp2/mrvl_ethdev.h b/drivers/net/mvpp2/mrvl_ethdev.h index 3726f78..2204be2 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.h +++ b/drivers/net/mvpp2/mrvl_ethdev.h @@ -10,12 +10,23 @@ #include #include +/* + * container_of is defined by both DPDK and MUSDK, + * we'll declare only one version. + * + * Note that it is not used in this PMD anyway. + */ +#ifdef container_of +#undef container_of +#endif + #include #include #include #include #include #include +#include "env/mv_common.h" /* for BIT() */ /** Maximum number of rx queues per port */ #define MRVL_PP2_RXQ_MAX 32 diff --git a/drivers/net/mvpp2/mrvl_flow.c b/drivers/net/mvpp2/mrvl_flow.c index 13295e6..db750f4 100644 --- a/drivers/net/mvpp2/mrvl_flow.c +++ b/drivers/net/mvpp2/mrvl_flow.c @@ -11,13 +11,8 @@ #include -#ifdef container_of -#undef container_of -#endif - #include "mrvl_ethdev.h" #include "mrvl_qos.h" -#include "env/mv_common.h" /* for BIT() */ /** Number of rules in the classifier table. */ #define MRVL_CLS_MAX_NUM_RULES 20 diff --git a/drivers/net/mvpp2/mrvl_qos.c b/drivers/net/mvpp2/mrvl_qos.c index 71856c1..eeb46f8 100644 --- a/drivers/net/mvpp2/mrvl_qos.c +++ b/drivers/net/mvpp2/mrvl_qos.c @@ -15,15 +15,6 @@ #include #include -/* Unluckily, container_of is defined by both DPDK and MUSDK, - * we'll declare only one version. - * - * Note that it is not used in this PMD anyway. - */ -#ifdef container_of -#undef container_of -#endif - #include "mrvl_qos.h" /* Parsing tokens. Defined conveniently, so that any correction is easy. */ -- 2.7.4