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 2128DA04F0 for ; Thu, 19 Dec 2019 15:40:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0E9281BFCD; Thu, 19 Dec 2019 15:40:16 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id F2A9F1BFCD for ; Thu, 19 Dec 2019 15:40:14 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id p17so5886612wmb.0 for ; Thu, 19 Dec 2019 06:40:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5nBkZQEegNGLUDNai2hDb7s4jEqH2OTx6zyCjo0bMsk=; b=lzzTv+i46+vhQbsTRiwZO1GhQjs36jRP+ItT9Sc5AqSPYxCQEHDuRCp+o+i4nX0aou iCz5L2lBHAwaYFO9F2k8BA0Y/4d+2knwJ4Aq/rR8qx6ISi+L0qv8ETfUSFUQ9PquZOuc NIKjasr5uPte1HQCKU3PNKmsqKRZT1e7W3m+/0zejP8TnvHHjqFb+FkRdvh+rSpAj8LW l5aZ6BZWr3EX2/kZ0PY486qMk7bofe96pzpVkSyWndEJKEiXTvXbKdzQcHmuUarPx8Wg cyb5Z+xe89LBSo2DQUGpTr3ffIF4GWIg6RZbg9Q8D0KEeO9cY+Bxy3/UjLC8+Y9bI3YU 6kCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5nBkZQEegNGLUDNai2hDb7s4jEqH2OTx6zyCjo0bMsk=; b=R0CQyLAFgqKXhAIRQpVZI3Nx/ln2CMo8G6iRpDMjBKT+FubjIBJMGbmBDl5NOchZg/ SjbL75cNZpSB2Sqk7YSdvGlWo9JaqjmsqfnkHCGnE3zvdpgVhmykvpLx0ojVt1trX3db hT309zglTxBMIEfIIuFCKuYzZGWrpqh0IlFlzsjpTt6iHsPPXh6a/w1CupQa67cN4EHg 5SG3o/sFtY85hb90Qkf7KuC33/c869rGALQ8pf3lWq4mL35BhKFmpM7xubQkBtLl47/t vf6UBCQFU0dGhNxWksN1COtICN5plNq/LvoEUdZYkSomswualiE4ahTeJyYbZ03sEs92 Tz9Q== X-Gm-Message-State: APjAAAUdqK/FmB18jHNr68M/qNBT8kILGJbP8UgEYhaYP5J9O+oBjJwg m2bm4liEFScau/TaB4BipVc= X-Google-Smtp-Source: APXvYqwBx4TbTc0DV8U7rsVTJc2Jokx7FsJHAAdVz0RuCcoqkW8z7Cp9eeK4oKSvoZ5CHZQxXiP2zw== X-Received: by 2002:a05:600c:22d3:: with SMTP id 19mr10201854wmg.92.1576766414517; Thu, 19 Dec 2019 06:40:14 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o194sm6584251wme.45.2019.12.19.06.40.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:40:13 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Thomas Monjalon , dpdk stable Date: Thu, 19 Dec 2019 14:33:59 +0000 Message-Id: <20191219143447.21506-92-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: use non deprecated PCI API' has been queued to LTS release 17.11.10 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 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/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. Thanks. Luca Boccassi --- >From 924cd8b3b32a12caa9c3515919de258c3b6dad6e Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 25 Oct 2019 15:56:04 +0200 Subject: [PATCH] net/bonding: use non deprecated PCI API [ upstream commit ce77e6bf5113650e6d026e0b7fb395b60ab1f363 ] rte_eal_compare_pci_addr has been deprecated since v17.11. Convert to rte_pci_addr_cmp. Fixes: c848b518bbc7 ("net/bonding: support bifurcated driver in eal") Signed-off-by: David Marchand Acked-by: Thomas Monjalon --- drivers/net/bonding/rte_eth_bond_args.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c index 8c94cc6171..e543f53ed6 100644 --- a/drivers/net/bonding/rte_eth_bond_args.c +++ b/drivers/net/bonding/rte_eth_bond_args.c @@ -92,11 +92,10 @@ find_port_id_by_dev_name(const char *name) static inline int bond_pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr) { - struct rte_pci_device *pdev; + const struct rte_pci_device *pdev = RTE_DEV_TO_PCI_CONST(dev); const struct rte_pci_addr *paddr = _pci_addr; - pdev = RTE_DEV_TO_PCI(*(struct rte_device **)(void *)&dev); - return rte_eal_compare_pci_addr(&pdev->addr, paddr); + return rte_pci_addr_cmp(&pdev->addr, paddr); } /** -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:30.003580830 +0000 +++ 0092-net-bonding-use-non-deprecated-PCI-API.patch 2019-12-19 14:32:26.217300046 +0000 @@ -1,13 +1,14 @@ -From ce77e6bf5113650e6d026e0b7fb395b60ab1f363 Mon Sep 17 00:00:00 2001 +From 924cd8b3b32a12caa9c3515919de258c3b6dad6e Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 25 Oct 2019 15:56:04 +0200 Subject: [PATCH] net/bonding: use non deprecated PCI API +[ upstream commit ce77e6bf5113650e6d026e0b7fb395b60ab1f363 ] + rte_eal_compare_pci_addr has been deprecated since v17.11. Convert to rte_pci_addr_cmp. Fixes: c848b518bbc7 ("net/bonding: support bifurcated driver in eal") -Cc: stable@dpdk.org Signed-off-by: David Marchand Acked-by: Thomas Monjalon @@ -16,10 +17,10 @@ 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c -index f298ea0e17..bfe03c3d06 100644 +index 8c94cc6171..e543f53ed6 100644 --- a/drivers/net/bonding/rte_eth_bond_args.c +++ b/drivers/net/bonding/rte_eth_bond_args.c -@@ -60,11 +60,10 @@ find_port_id_by_dev_name(const char *name) +@@ -92,11 +92,10 @@ find_port_id_by_dev_name(const char *name) static inline int bond_pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr) {