From patchwork Tue Oct 24 15:00:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116959 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5913922qgn; Tue, 24 Oct 2017 08:06:37 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QA9Eqq+MkU6T0kDK5ke8CEFIHmYPw4yvbvlus0SOfkmgmOnzVCgwQfIFCxvf+N4XbFNJ99 X-Received: by 10.237.58.225 with SMTP id o88mr23711127qte.190.1508857597530; Tue, 24 Oct 2017 08:06:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508857597; cv=none; d=google.com; s=arc-20160816; b=lNUuUNHYhS87/tYh9JVFujStk5FfoQ1lcQJEKwO/igosnzSy55OaiWpu+4xntBWHXu JjfIA+uyHdz5LDf1HyhBDhgTDX59godMmu19qH8TcKunfYd4eHUhn5GJGe2fei7IRRil 1kYTYIB6MsH2b3ib1eZNrXTfkn499kO82JpROchfitaqHKM6AtBi4rklC9crEU9ubm+Y BKWNOuTDw2cXkWNUOuOYdEO+Quv5ZrqrBYwWvi2xNnnBdSUojX9wErxI7/Kk2o/4A53Y vISyOeXB6fhxnPGj+SN86hVjUUwTsksuaFcbHm4MJX/ebzqJLKojgKm2VRfiG641Fmg8 J/WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=NJbI9OIJQ7Mw5MRLHCag+NeM+Td3MRhspEjl2C8OqdA=; b=GH8/aX/EZntqWlxAQf0K25x6WCdPfzgymcpLY3mRDlc85E7PtX7Ak/nv0uBW+EgDfc yfjCUCRHReqlqd/N9UzERcaHba8bJ19eRzQrKE3XefZTCAClUciB3F3Srf76w5xoKZy2 HtGhl8OtmtIumIaGkh6/ppmCey83hMIJK/SLiUhgmLTApFSJJ50f5amITLODdNH4njyr 6ScluaVQsZHCPxBcTq8n/Uo6gEotvWTamZHdmIEu3bdFMuRF+ryz2XSfg9Qjv+Ba/raw 8+ISou0xK7RfErNZ9EWBIvMqlDf8++KG1nwxcALobZfWDAZNJiDWY68wJs/Cy6hzSRYq i7uA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id f30si412474qkf.238.2017.10.24.08.06.37; Tue, 24 Oct 2017 08:06:37 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 18EA162950; Tue, 24 Oct 2017 15:06:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 9FFB062919; Tue, 24 Oct 2017 15:01:48 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 954D162940; Tue, 24 Oct 2017 15:01:38 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 4150662919 for ; Tue, 24 Oct 2017 15:00:40 +0000 (UTC) Received: from mxback1o.mail.yandex.net (mxback1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1b]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 383347862F2 for ; Tue, 24 Oct 2017 18:00:39 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback1o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id k0jTgm2DPB-0dI8TO40; Tue, 24 Oct 2017 18:00:39 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 5zlZKw6b9U-0cPS2LB0; Tue, 24 Oct 2017 18:00:38 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 24 Oct 2017 18:00:07 +0300 Message-Id: <1508857207-23099-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> References: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v2 6/6] linux-gen: pktio: remove duplicate pktio_ops subsystem implementation X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bogdan Pricope Remove duplicate pktio_ops subsystem implementation Signed-off-by: Bogdan Pricope --- /** Email created from pull request 255 (bogdanPricope:2_0_pktio_sub_unif_pr) ** https://github.com/Linaro/odp/pull/255 ** Patch: https://github.com/Linaro/odp/pull/255.patch ** Base sha: d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f ** Merge commit sha: 7ba6d7f0e026041bb48d6d90f02d9b556020c337 **/ platform/linux-dpdk/Makefile.am | 2 +- platform/linux-dpdk/pktio/subsystem.c | 39 -------------------------------- platform/linux-generic/pktio/subsystem.c | 2 ++ 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 platform/linux-dpdk/pktio/subsystem.c diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index c99cfaa1c..e2a0249df 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -251,7 +251,7 @@ __LIB__libodp_dpdk_la_SOURCES = \ ../linux-generic/odp_name_table.c \ odp_packet.c \ pktio/dpdk.c \ - pktio/subsystem.c \ + ../linux-generic/pktio/subsystem.c \ odp_packet_flags.c \ ../linux-generic/odp_packet_io.c \ ../linux-generic/pktio/loopback.c \ diff --git a/platform/linux-dpdk/pktio/subsystem.c b/platform/linux-dpdk/pktio/subsystem.c deleted file mode 100644 index ab99db0d5..000000000 --- a/platform/linux-dpdk/pktio/subsystem.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (c) 2017, ARM Limited. All rights reserved. - * - * Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include - -#include -#include - -#define SUBSYSTEM_VERSION 0x00010000UL -ODP_SUBSYSTEM_DEFINE(pktio_ops, "packet IO operations", SUBSYSTEM_VERSION); - -/* Instantiate init and term functions */ -ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, init_global, ODP_ERR) -ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, init_local, ODP_ERR) -ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, term_global, ODP_ABORT) - -/* Temporary variable to enable link modules, - * will remove in Makefile scheme changes. - */ -#ifdef ODP_PKTIO_DPDK -extern int enable_link_dpdk_pktio_ops; -#endif -extern int enable_link_loopback_pktio_ops; - -ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) -{ - odp_subsystem_constructor(pktio_ops); - - /* Further initialization per subsystem */ -#ifdef ODP_PKTIO_DPDK - enable_link_dpdk_pktio_ops = 1; -#endif - enable_link_loopback_pktio_ops = 1; -} diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index d26c152c3..a3b36c144 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include