From patchwork Tue Apr 11 15:44:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 23537 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id BF0DAD332; Tue, 11 Apr 2017 17:45:31 +0200 (CEST) Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by dpdk.org (Postfix) with ESMTP id 60757D267 for ; Tue, 11 Apr 2017 17:45:14 +0200 (CEST) Received: by mail-wm0-f44.google.com with SMTP id o81so66906732wmb.1 for ; Tue, 11 Apr 2017 08:45:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=vv5pUykXSySVhVtZHiWY/j83QIKECpHzrOtDLsRdeEM=; b=ttPcHa1Iyj6YkAZK2NPQhmgQqWj8YRfRkgLrUMcryefqk2K4e+ixHd/hQDzDXAuu07 QSMToyOxSmkJpij8euVYytQ4LguKLuyY6Hq0JS610N83oBl0QK+LypTNgXh7yAVl1ZUc 3K1xz5dU9XxonvcrW7QWmW7Ig0r7+RIttmS8uB6pzXYaW4MA3/ovfNMIxPOINtXDKt1M qezLDEyhJUiFrjFclR3Alp0siMW6AwyNdeBI/K+oj5OlfxbmYzNAMATMJXb3tS0TY4Ui c/BYUYjuaHHTxIRAUQAuPDHRSljlHqpa/QLauajQPb6gvgqhWzv/eMhmU0wY7wnBfG8O 0BBg== 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:in-reply-to:references; bh=vv5pUykXSySVhVtZHiWY/j83QIKECpHzrOtDLsRdeEM=; b=ni7RcLr+gdYhi6VjCciIcXqtUQ4E2F/kcKKweFiBgjZT41ZuZHxpom2xEtDddGwBcD oyyyjsQI0rSDAf8ZVUBkYe42ObwLUD+wirSEY42+hfThBAwb/vuSV1MrONnhSCchNCXH zNsNNcbyYQyHMVQYKR/V9a/lGOMgm333/shbpBuoCz3++oI/deR4icibLiDSCcMfy82a F5fhSStjG70p28Iz0ZeD+fMQGPNfn2t87PG2tkmIy1lpp+8X/GeA2AtYrJ4fY/2d2Gu2 WOLF5hr993/fq04D8nQpxBULgnfNJryDKGaw+sYgkvWsAhzusYCMdwSO//AQ3WuY4lr2 M3JQ== X-Gm-Message-State: AN3rC/6Jreb7W8QfEQaRQnCk2ad6S615MOPimEieaVbh/a66MB6pAvNG hOtSF2GT84uDJmC8 X-Received: by 10.28.5.8 with SMTP id 8mr14718913wmf.70.1491925514112; Tue, 11 Apr 2017 08:45:14 -0700 (PDT) Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id u63sm2933738wmu.22.2017.04.11.08.45.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Apr 2017 08:45:13 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Jan Blunck Date: Tue, 11 Apr 2017 17:44:17 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: <1488794430-25179-1-git-send-email-jblunck@infradead.org> In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 10/42] net/null: internalize eth_dev_null_create() 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Jan Blunck There is no need to export this API. Remaining users should use the rte_eal_vdev_init() function instead. Signed-off-by: Jan Blunck --- drivers/net/null/Makefile | 7 +----- drivers/net/null/rte_eth_null.c | 4 +--- drivers/net/null/rte_eth_null.h | 40 ------------------------------- drivers/net/null/rte_pmd_null_version.map | 7 ------ test/test/test_link_bonding_rssconf.c | 1 - 5 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 drivers/net/null/rte_eth_null.h diff --git a/drivers/net/null/Makefile b/drivers/net/null/Makefile index 40a839f..77810bc 100644 --- a/drivers/net/null/Makefile +++ b/drivers/net/null/Makefile @@ -41,16 +41,11 @@ CFLAGS += $(WERROR_FLAGS) EXPORT_MAP := rte_pmd_null_version.map -LIBABIVER := 1 +LIBABIVER := 2 # # all source are stored in SRCS-y # SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += rte_eth_null.c -# -# Export include files -# -SYMLINK-y-include += rte_eth_null.h - include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 4a0d07d..863fcc7 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -39,8 +39,6 @@ #include #include -#include "rte_eth_null.h" - #define ETH_NULL_PACKET_SIZE_ARG "size" #define ETH_NULL_PACKET_COPY_ARG "copy" @@ -478,7 +476,7 @@ static const struct eth_dev_ops ops = { static struct rte_vdev_driver pmd_null_drv; -int +static int eth_dev_null_create(const char *name, const unsigned numa_node, unsigned packet_size, diff --git a/drivers/net/null/rte_eth_null.h b/drivers/net/null/rte_eth_null.h deleted file mode 100644 index abada8c..0000000 --- a/drivers/net/null/rte_eth_null.h +++ /dev/null @@ -1,40 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2015 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef RTE_ETH_NULL_H_ -#define RTE_ETH_NULL_H_ - -int eth_dev_null_create(const char *name, const unsigned numa_node, - unsigned packet_size, unsigned packet_copy); - -#endif /* RTE_ETH_NULL_H_ */ diff --git a/drivers/net/null/rte_pmd_null_version.map b/drivers/net/null/rte_pmd_null_version.map index 84b1d0f..ef35398 100644 --- a/drivers/net/null/rte_pmd_null_version.map +++ b/drivers/net/null/rte_pmd_null_version.map @@ -2,10 +2,3 @@ DPDK_2.0 { local: *; }; - -DPDK_2.2 { - global: - - eth_dev_null_create; - -} DPDK_2.0; diff --git a/test/test/test_link_bonding_rssconf.c b/test/test/test_link_bonding_rssconf.c index 3a2cac3..f356c95 100644 --- a/test/test/test_link_bonding_rssconf.c +++ b/test/test/test_link_bonding_rssconf.c @@ -52,7 +52,6 @@ #include #include #include -#include #include "test.h"