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 A52EAA0613 for ; Wed, 28 Aug 2019 15:42:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9BE201BF82; Wed, 28 Aug 2019 15:42:56 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id CE5E11C247 for ; Wed, 28 Aug 2019 15:42:55 +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 4DF6E18C4267; Wed, 28 Aug 2019 13:42:55 +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 5A3DA196AE; Wed, 28 Aug 2019 13:42:54 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Wed, 28 Aug 2019 14:41:46 +0100 Message-Id: <20190828134234.20547-10-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.6.2 (mx1.redhat.com [10.5.110.62]); Wed, 28 Aug 2019 13:42:55 +0000 (UTC) Subject: [dpdk-stable] patch 'net/af_packet: 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/da09046fee26174b089b99cd6eb8db69be43300e Thanks. Kevin Traynor --- >From da09046fee26174b089b99cd6eb8db69be43300e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 11 Jul 2019 13:03:02 -0700 Subject: [PATCH] net/af_packet: remove redundant declaration [ upstream commit a239d86244c01ac06c7a597c58086020834df887 ] 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 Reviewed-by: Ferruh Yigit --- drivers/net/af_packet/rte_eth_af_packet.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 264cfc08f..cca223952 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -528,6 +528,4 @@ open_packet_iface(const char *key __rte_unused, } -static struct rte_vdev_driver pmd_af_packet_drv; - static int rte_pmd_init_internals(struct rte_vdev_device *dev, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:32.391231739 +0100 +++ 0011-net-af_packet-remove-redundant-declaration.patch 2019-08-28 14:32:31.618957873 +0100 @@ -1 +1 @@ -From a239d86244c01ac06c7a597c58086020834df887 Mon Sep 17 00:00:00 2001 +From da09046fee26174b089b99cd6eb8db69be43300e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a239d86244c01ac06c7a597c58086020834df887 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index b349b386a..2f6508f68 100644 +index 264cfc08f..cca223952 100644 @@ -22 +23 @@ -@@ -533,6 +533,4 @@ open_packet_iface(const char *key __rte_unused, +@@ -528,6 +528,4 @@ open_packet_iface(const char *key __rte_unused,