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 911F2A0613 for ; Wed, 28 Aug 2019 15:42:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 874F51C232; Wed, 28 Aug 2019 15:42:55 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 899431C242 for ; Wed, 28 Aug 2019 15:42:54 +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 F2AD9611E; Wed, 28 Aug 2019 13:42:53 +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 CF08F4D3E; Wed, 28 Aug 2019 13:42:52 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Keith Wiles , dpdk stable Date: Wed, 28 Aug 2019 14:41:45 +0100 Message-Id: <20190828134234.20547-9-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.28]); Wed, 28 Aug 2019 13:42:54 +0000 (UTC) Subject: [dpdk-stable] patch 'net/tap: remove redundant declarations' 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/92d9311bacda624854ebe0f00d390c824b1db9ca Thanks. Kevin Traynor --- >From 92d9311bacda624854ebe0f00d390c824b1db9ca Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 11 Jul 2019 13:03:01 -0700 Subject: [PATCH] net/tap: remove redundant declarations [ upstream commit 0310fd25b4a9c3ebb604b1447c32149b085a548a ] The rte_vdev_drivers are declared twice. The first one is not necessary. Fixes: 740feaf349b1 ("ethdev: remove driver name from device private data") Fixes: 204d026a3922 ("net/tap: support tun") Signed-off-by: Stephen Hemminger Acked-by: Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 867873683..37bd25011 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -71,6 +71,4 @@ static int tap_devices_count; -static struct rte_vdev_driver pmd_tap_drv; -static struct rte_vdev_driver pmd_tun_drv; static const char *valid_arguments[] = { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:32.330860442 +0100 +++ 0010-net-tap-remove-redundant-declarations.patch 2019-08-28 14:32:31.617957895 +0100 @@ -1 +1 @@ -From 0310fd25b4a9c3ebb604b1447c32149b085a548a Mon Sep 17 00:00:00 2001 +From 92d9311bacda624854ebe0f00d390c824b1db9ca Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0310fd25b4a9c3ebb604b1447c32149b085a548a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 3841842f0..64bd04911 100644 +index 867873683..37bd25011 100644 @@ -23 +24 @@ -@@ -72,6 +72,4 @@ +@@ -71,6 +71,4 @@