From patchwork Fri Aug 4 09:00:01 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: 109376 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp1881688qge; Fri, 4 Aug 2017 02:03:52 -0700 (PDT) X-Received: by 10.200.57.81 with SMTP id t17mr2280731qtb.45.1501837432119; Fri, 04 Aug 2017 02:03:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501837432; cv=none; d=google.com; s=arc-20160816; b=HuA2Sdt/rh9Ai+NXj7v8DPK3vvKxf7OqyehGF75sq7GPTzeY1bdhlHnRnNb1a5CtyN f3rmP6ps1QEHqKN/wXCnah2HrkNRSw3OJ+a1oM3NzRiV126JGXKRp+/dvGdo8s5uqqOh QtG3DpS+VuQeyvJvkGpCaaJ+eJinuaIoOKmVNYd2hRCxkV6mdOEudwGBouxaY9bCMmD8 jzVaS+itI3clq40RYSqclkvcztg8HPRKYzHKJxPsyyvVg1sDXpXSPJ9ul1klayc6WCZ2 a/ZTtNZOB4h+H0ni9VvmL1FYvKYG9yJJWxphVV05tOpSDQ7/N1w4QMbOu9RaHa+kjD3F DV5g== 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=BLMSw/gv1s8M+WWuizNADTf9VH/EEBDnVfNM6aBNGZw=; b=o2CYgidSJduU7BBzplbhkeTp+I4M3p6ckbJDSjWIxUvH2v0HCET9LOkirYZZYx6Ima kfIHwLDN7mbLnRl9E2i34gcOao9K771XSjVv+KNr7LGNv6uCD9kdpoDNE23qRChIIIYf i6aeOMsK1MBW+0KB/NwfGhgUM48xWBLT6GvUGfZgxrgwzR2w/QYR0DXIOO8Xpjhkup9k 3YAEA3Ei456MLJckaMi/qYzut5SyppYYMgJwzLC9pJEIGaPEa0bMa6KqVQ0+uzIwKhXK zGeHfqBU3Cl0kMUD8Z914IyUGKx9M7JvOqisMZ61LU1Z6ox6gCleGUr7Zo7QT56RGugT HFxA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 30si1217613qte.147.2017.08.04.02.03.51; Fri, 04 Aug 2017 02:03:52 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 ACBD764486; Fri, 4 Aug 2017 09:03:51 +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,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 11F566358D; Fri, 4 Aug 2017 09:01:33 +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 7683F644C5; Fri, 4 Aug 2017 09:01:28 +0000 (UTC) Received: from forward1o.cmail.yandex.net (forward1o.cmail.yandex.net [37.9.109.84]) by lists.linaro.org (Postfix) with ESMTPS id 44F6062DF5 for ; Fri, 4 Aug 2017 09:00:37 +0000 (UTC) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [37.140.190.26]) by forward1o.cmail.yandex.net (Yandex) with ESMTP id B22A621167 for ; Fri, 4 Aug 2017 12:00:35 +0300 (MSK) Received: from smtp1o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp1o.mail.yandex.net (Yandex) with ESMTP id EBE7C1300E60 for ; Fri, 4 Aug 2017 12:00:30 +0300 (MSK) Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id kkQJPUXR1g-0TG41FYt; Fri, 04 Aug 2017 12:00:29 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 4 Aug 2017 12:00:01 +0300 Message-Id: <1501837208-7450-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501837208-7450-1-git-send-email-odpbot@yandex.ru> References: <1501837208-7450-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 108 Subject: [lng-odp] [PATCH API-NEXT v1 6/13] linux-gen: pktio: drop/staticize leftovers from single queue shim 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: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 108 (lumag:symbols-cleanup) ** https://github.com/Linaro/odp/pull/108 ** Patch: https://github.com/Linaro/odp/pull/108.patch ** Base sha: 8390f890d4bd2babb63a24f7b15d2f4763e44050 ** Merge commit sha: 44fd671a0d2772a32395c7f0574aa545d2a9aa71 **/ .../linux-generic/include/odp_packet_io_internal.h | 13 ------------- platform/linux-generic/odp_packet_io.c | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 20a86557..1a4e345f 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -252,19 +252,6 @@ static inline void pktio_cls_enabled_set(pktio_entry_t *entry, int ena) entry->s.cls_enabled = ena; } -/* - * Dummy single queue implementations of multi-queue API - */ -int single_capability(odp_pktio_capability_t *capa); -int single_input_queues_config(pktio_entry_t *entry, - const odp_pktin_queue_param_t *param); -int single_output_queues_config(pktio_entry_t *entry, - const odp_pktout_queue_param_t *param); -int single_recv_queue(pktio_entry_t *entry, int index, odp_packet_t packets[], - int num); -int single_send_queue(pktio_entry_t *entry, int index, - const odp_packet_t packets[], int num); - extern const pktio_if_ops_t netmap_pktio_ops; extern const pktio_if_ops_t dpdk_pktio_ops; extern const pktio_if_ops_t sock_mmsg_pktio_ops; diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 709f9c23..3a5d6d5d 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1070,6 +1070,17 @@ int odp_pktio_term_global(void) return ret; } +static +int single_capability(odp_pktio_capability_t *capa) +{ + memset(capa, 0, sizeof(odp_pktio_capability_t)); + capa->max_input_queues = 1; + capa->max_output_queues = 1; + capa->set_op.op.promisc_mode = 1; + + return 0; +} + int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa) { pktio_entry_t *entry; @@ -1673,13 +1684,3 @@ int odp_pktout_send(odp_pktout_queue_t queue, const odp_packet_t packets[], return entry->s.ops->send(entry, queue.index, packets, num); } - -int single_capability(odp_pktio_capability_t *capa) -{ - memset(capa, 0, sizeof(odp_pktio_capability_t)); - capa->max_input_queues = 1; - capa->max_output_queues = 1; - capa->set_op.op.promisc_mode = 1; - - return 0; -}