From patchwork Wed Apr 13 10:02:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Elo, Matias \(Nokia - FI/Espoo\)" X-Patchwork-Id: 65708 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2407654qge; Wed, 13 Apr 2016 03:02:46 -0700 (PDT) X-Received: by 10.55.17.153 with SMTP id 25mr2508316qkr.18.1460541766317; Wed, 13 Apr 2016 03:02:46 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id w126si27886043qhw.15.2016.04.13.03.02.45; Wed, 13 Apr 2016 03:02:46 -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 dis=NONE) header.from=nokia.com Received: by lists.linaro.org (Postfix, from userid 109) id 74A9B68281; Wed, 13 Apr 2016 10:02:45 +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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 434A2675C3; Wed, 13 Apr 2016 10:02:40 +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 DAAEC682B5; Wed, 13 Apr 2016 10:02:37 +0000 (UTC) Received: from demumfd001.nsn-inter.net (demumfd001.nsn-inter.net [93.183.12.32]) by lists.linaro.org (Postfix) with ESMTPS id 87585675C3 for ; Wed, 13 Apr 2016 10:02:35 +0000 (UTC) Received: from demuprx017.emea.nsn-intra.net ([10.150.129.56]) by demumfd001.nsn-inter.net (8.15.2/8.15.2) with ESMTPS id u3DA2XZ7028239 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 13 Apr 2016 10:02:34 GMT Received: from 10.144.19.15 ([10.144.104.112]) by demuprx017.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id u3DA2W5O032764 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO) for ; Wed, 13 Apr 2016 12:02:33 +0200 From: Matias Elo To: lng-odp@lists.linaro.org Date: Wed, 13 Apr 2016 13:02:32 +0300 Message-Id: <1460541752-2280-1-git-send-email-matias.elo@nokia.com> X-Mailer: git-send-email 1.9.1 X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-size: 966 X-purgate-ID: 151667::1460541754-00001B3D-0F3D6495/0/0 X-Topics: patch Subject: [lng-odp] [API-NEXT PATCH] linux-generic: dpdk: fix merge bug 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: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" DPDK pktio build is broken due to a merge error. Deprecated dpdk_recv() function was already removed in 'linux-generic: dpdk: remove old recv/send functions' commit. Fix problem by removing the deprecated code. Signed-off-by: Matias Elo --- platform/linux-generic/pktio/dpdk.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 5cbf22d..4aff57c 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -824,13 +824,6 @@ static int dpdk_recv_queue(pktio_entry_t *pktio_entry, return nb_rx; } -static int dpdk_recv(pktio_entry_t *pktio_entry, - odp_packet_t pkt_table[], - unsigned num) -{ - return dpdk_recv_queue(pktio_entry, 0, pkt_table, num); -} - static int dpdk_send_queue(pktio_entry_t *pktio_entry, int index, odp_packet_t pkt_table[],