From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EEF02A0613 for ; Wed, 28 Aug 2019 15:43:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E616E1BF82; Wed, 28 Aug 2019 15:43:01 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 06B7B1C24B for ; Wed, 28 Aug 2019 15:43:00 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 78BB7A76C; Wed, 28 Aug 2019 13:42:59 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E2CC166A0; Wed, 28 Aug 2019 13:42:58 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Wed, 28 Aug 2019 14:41:49 +0100 Message-Id: <20190828134234.20547-13-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 28 Aug 2019 13:42:59 +0000 (UTC) Subject: [dpdk-stable] patch 'net/pcap: remove redundant declaration' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/04/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/396f610725e7519d99f1ded098046df178c888ab Thanks. Kevin Traynor --- >From 396f610725e7519d99f1ded098046df178c888ab Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 11 Jul 2019 13:03:05 -0700 Subject: [PATCH] net/pcap: remove redundant declaration [ upstream commit 22aeb6c706aa68823efb4e646406d42c59fe32b7 ] The rte_vdev_driver is declared twice. The first one is not necessary. Fixes: 050fe6e9ff97 ("drivers/net: use ethdev allocation helper for vdev") Signed-off-by: Stephen Hemminger Acked-by: Ferruh Yigit --- drivers/net/pcap/rte_eth_pcap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 65bbd7e2f..ccf07d433 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -909,6 +909,4 @@ select_phy_mac(const char *key __rte_unused, const char *value, } -static struct rte_vdev_driver pmd_pcap_drv; - static int pmd_init_internals(struct rte_vdev_device *vdev, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:32.567139374 +0100 +++ 0014-net-pcap-remove-redundant-declaration.patch 2019-08-28 14:32:31.622957784 +0100 @@ -1 +1 @@ -From 22aeb6c706aa68823efb4e646406d42c59fe32b7 Mon Sep 17 00:00:00 2001 +From 396f610725e7519d99f1ded098046df178c888ab Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 22aeb6c706aa68823efb4e646406d42c59fe32b7 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 26e85183e..7ff6dc38d 100644 +index 65bbd7e2f..ccf07d433 100644 @@ -22 +23 @@ -@@ -1086,6 +1086,4 @@ get_infinite_rx_arg(const char *key __rte_unused, +@@ -909,6 +909,4 @@ select_phy_mac(const char *key __rte_unused, const char *value,