From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id C0AE32C38 for ; Tue, 4 Sep 2018 09:10:35 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id f6-v6so1197776plo.1 for ; Tue, 04 Sep 2018 00:10:35 -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=woBXmNVHqSgg2F1hFxpFNXtegsYGXF4hmvppsjeSKRU=; b=2BD9OzzPhRuXaJ9zhYp894BH2shoba5DQj56TJrT+ePQy7MGu18o4O+sQNTvH81aN0 h/P0pWrUCXY5ZeXFiQ1+vI3wHfxvUdml7k5o807z8y/ZY0MSwY+iLnTvybBUASTonr+l kEB3kpO9pp1JYqleZmkQiknl8Ciu6t7oCw1xpIzk2Egxix/rxdH45H6IIgI+fbAnQ8kp lgXRC2M+6Fm23wWRt/eSOKRAfL8jI3McOZxmXrfuOp/wCLQEDL1dTaNgDZr2vlvC9RSy OEWooBaFZxmFZa0pkRni3xZCFiuUl/fsDbDDXxV3D7y4H1o5rDL5yCGJF5ToNlJ4s+Yv FeCw== 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=woBXmNVHqSgg2F1hFxpFNXtegsYGXF4hmvppsjeSKRU=; b=LuP9CvEa23nVAWG+DehBCF9pn3UhUlemFHcFH1t1fg8qQMtmHMzyC6HUW/PA43GMFI 4ThDPVI8aRk6FihS51YS541thcuvyNMZxLQSocNrR2te6fJXwUzz5t/8HcnzvxfKEvRu FgmgL0ygQFcn/f4cnhNZOEwgyjrojdxkOAsuFuAhkR7ZxszHiUV/WllDiw1+9mNVVfQb PYepDysPtvIdJUezZ5Uzy4O9LV+wXeaTokkB910mt+LrM2JtAYqYlNNVUOu8HsxxZZGE 7/RDZr4ViYrJvcFia4SOXznmvsXPlswK2HJok5zmpjejXnAE1v4EJVAjZxpoGGT/sJ4t J2Gg== X-Gm-Message-State: APzg51DDnF214p9hlGh84bDmtkcpiLY93kEwWlcf9oh+g6BVWwdH0uzp EPFXa/lvbLs053oJzHE3OYxEVvN/CTyJ/g== X-Google-Smtp-Source: ANB0VdbJhn7/qGDWeAVbCnR4JaZKz9TZWd9fBONxfkET0fhZe+VzukROU9uPOn1i/pIxWs4IADj80w== X-Received: by 2002:a17:902:6a83:: with SMTP id n3-v6mr31784606plk.246.1536045034637; Tue, 04 Sep 2018 00:10:34 -0700 (PDT) Received: from sh.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id l79-v6sm31229451pfb.111.2018.09.04.00.10.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Sep 2018 00:10:33 -0700 (PDT) From: Tomasz Duszynski To: dev@dpdk.org Cc: nsamsono@marvell.com, mw@semihalf.com, Tomasz Duszynski Date: Tue, 4 Sep 2018 09:10:10 +0200 Message-Id: <1536045016-32008-3-git-send-email-tdu@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536045016-32008-1-git-send-email-tdu@semihalf.com> References: <1536045016-32008-1-git-send-email-tdu@semihalf.com> Subject: [dpdk-dev] [PATCH 2/8] 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, 04 Sep 2018 07:10:36 -0000 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 f022cad..adb07d0 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