From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <tdu@semihalf.com> Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) by dpdk.org (Postfix) with ESMTP id 57E492B92 for <dev@dpdk.org>; Tue, 4 Sep 2018 15:49:25 +0200 (CEST) Received: by mail-lj1-f193.google.com with SMTP id j19-v6so3205712ljc.7 for <dev@dpdk.org>; Tue, 04 Sep 2018 06:49:25 -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=PSldXz1mrnCt+mRStXi4nXqqRTlQSkw5wa0W2EcA4OxcuK+3rT6MtxCJR6ZrRK9FPt zcU68BJlobjyZl9jp5iQUY0PSsMjKoVBZ766duFPNn+oVOHUPuWtcLRKXGwxM5Om0Jg0 ZGhFySYhwIpebsCpEY4Qt5goBbE1GcISwMePIF7VSy2uLDjIwJM2sVl1JQ2TsxP81Dpy XFJ2JHFqpct68FNousQ8I98Nb5GxjOQnAsX1MSZudVqMjlv9dXfyvSF1bgYpV4uhmxP8 /0jisesZbZwENWEGsp+0c2nZyrVAsJSvNbOK2h7z1MPwARjdbM7dgo8s/Bx8keO4vxsL AhaA== 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=GhY/d/GpmRFfgPl4+8/1oxEPR/qTQc3ek7yBDPi4kDoDq5G3N8Vy5H0i//evX+M73c RBCXGPy/jSHGwAyhp6+zatE2shelAKkM+GUsUgeSchrXAqGWbP1f4inQNYxVqHgHsTab ZHzQ27ggvclMJdduJHxKo8l8nMFXVrFJrtT67QB0elabLqyOC2aRms3rWHIKWGwHIEO3 aYSfSJ6TKcdcnIVs8Dfd6q5qqdz35I0tw+SLYnhGg7J+yA2ohrT0SYTuLpFijPiCHm0k 6XrgWTGnb8XcP8xDvYl/KsujDfQm8k5SdmcNc+LTxQgwsZjgHsYi3/3iSDinMobb67KM BW8g== X-Gm-Message-State: APzg51C6fgYmgPLQDKxiVOxyRvKEoTxBO8RtPLeSYywne2I629gmOtom uvvUbMAaq3VahK1uyEZahjVZaibEATWgyw== X-Google-Smtp-Source: ANB0VdYtvYK+mGdOT/Sc6KqGSjcUqpvCW4iLHAiIIOohIB1dzMaYRDo3E2oNiAiSKfBcRi8ab/3+KQ== X-Received: by 2002:a2e:498:: with SMTP id a24-v6mr21477591ljf.27.1536068964676; Tue, 04 Sep 2018 06:49:24 -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 q22-v6sm4057225lff.10.2018.09.04.06.49.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Sep 2018 06:49:23 -0700 (PDT) From: Tomasz Duszynski <tdu@semihalf.com> To: dev@dpdk.org Cc: nsamsono@marvell.com, mw@semihalf.com, Tomasz Duszynski <tdu@semihalf.com> Date: Tue, 4 Sep 2018 15:49:03 +0200 Message-Id: <1536068953-9352-3-git-send-email-tdu@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536068953-9352-1-git-send-email-tdu@semihalf.com> References: <1536045016-32008-1-git-send-email-tdu@semihalf.com> <1536068953-9352-1-git-send-email-tdu@semihalf.com> Subject: [dpdk-dev] [PATCH v2 02/12] net/mvpp2: move common code X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions <dev.dpdk.org> List-Unsubscribe: <https://mails.dpdk.org/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://mails.dpdk.org/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <https://mails.dpdk.org/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> X-List-Received-Date: Tue, 04 Sep 2018 13:49:25 -0000 Cleanup sources by moving common code to the pmd header file. Signed-off-by: Tomasz Duszynski <tdu@semihalf.com> Signed-off-by: Natalie Samsonov <nsamsono@marvell.com> Reviewed-by: Liron Himi <lironh@marvell.com> --- 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 <rte_malloc.h> #include <rte_bus_vdev.h> -/* 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 <fcntl.h> #include <linux/ethtool.h> #include <linux/sockios.h> 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 <rte_spinlock.h> #include <rte_flow_driver.h> +/* + * 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 <env/mv_autogen_comp_flags.h> #include <drivers/mv_pp2.h> #include <drivers/mv_pp2_bpool.h> #include <drivers/mv_pp2_cls.h> #include <drivers/mv_pp2_hif.h> #include <drivers/mv_pp2_ppio.h> +#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 <arpa/inet.h> -#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 <rte_malloc.h> #include <rte_string_fns.h> -/* 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