From patchwork Tue Oct 24 08:00:06 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: 116918 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5527433qgn; Tue, 24 Oct 2017 01:06:28 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SBmNnDygjHbWr58mWECyC/cTgodEZUNxTWOmJTmhL+hViMPe/Zr9CZnbiuYxmHxWwwpje8 X-Received: by 10.237.62.45 with SMTP id l42mr24009759qtf.46.1508832387982; Tue, 24 Oct 2017 01:06:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508832387; cv=none; d=google.com; s=arc-20160816; b=ciSFnBVkVJ4saZ1NsLfEvWS4KSGTKAsqAJ9WhciLqG2P0kSiMMujaOZe6+nom4f5lp 37sv4mOIEtVLF/FLh2nSZlpa2hVGxhGTNf1IbLwa+0Oai7m8dZODp7ofEeFURX1uaUER 0sDr411oSa+aCa62Xs5VfwSWahbZlXEwIeNptnsrlomBfuzpFtejnC4tc6+gBeay5KMp m2h53lj4cSqCEBJXBMZLn/43TnAjZWwR/qZPmNqV2N4GEdpu0Ig4Kf4+OmHwd2JFmFLC Pg9bAuk0p+WVdtJdT0K3ZTsL4XAM0fl8DDEDmVD4IgPeBxnuvr662W5sCDr8iDJ4FAAs OrwQ== 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=OFj7Z+dTyXMpraXlpJ+CJltMezoueBrI9deBxBy3IIg=; b=QBdV/LUxa6PDxxU03/zIYF/eq9yHmtfopL992mpXFesir/gjAOxoP905bouFx5UxcG PLmxra8ZV59UfRhu9UEsIemvuaaP/RE86zoy+DVCZ9gUewX7PfFZyKNjn4CWruJey00u OWyyJOTA7tnoDjyUE9aEAIP9++te3np6KNarSV0l7meO4sEkEj9AFL1yVe1HiRB/vQZZ x0bxgwNrZ0oR1z5F7AryOpbZvbP4fy7rfKwf80zxep0i8gJppoU1vaLLUSVww+N9NPmL 5WY2IXp6BsPopoBh0Y6Srvvkm8MzWNFSFEwhmcuhSgHxlqP+NMiDOPbeYvFciFpG/Psn wCxg== 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 i96si3341208qtb.455.2017.10.24.01.06.27; Tue, 24 Oct 2017 01:06:27 -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 903C06292B; Tue, 24 Oct 2017 08:06:27 +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 0AFE562936; Tue, 24 Oct 2017 08:02:08 +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 81E9C62936; Tue, 24 Oct 2017 08:01:56 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id E005560890 for ; Tue, 24 Oct 2017 08:01:02 +0000 (UTC) Received: from mxback17j.mail.yandex.net (mxback17j.mail.yandex.net [IPv6:2a02:6b8:0:1619::93]) by forward104o.mail.yandex.net (Yandex) with ESMTP id D17D97016D1 for ; Tue, 24 Oct 2017 11:00:36 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback17j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id xg5ajMjI7E-0ZCKe8UM; Tue, 24 Oct 2017 11:00:35 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id E1sIWHVkFs-0YEGVkwF; Tue, 24 Oct 2017 11:00:34 +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 11:00:06 +0300 Message-Id: <1508832006-16435-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> References: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v1 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: e88dcc92184de56a453032c5b2ea7e664864fb04 **/ 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