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 03A34A04F0 for ; Tue, 10 Dec 2019 16:01:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EFABC1B13C; Tue, 10 Dec 2019 16:01:06 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 4D9341BE9D for ; Tue, 10 Dec 2019 16:01:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oWtnIrRCbWYeJhCrGp7d+HJZL7cMq2TWs1ebbGhrR0o=; b=bReNGt+L0ua1nBhwHyG003vgl2No5Uew6v4wwrcgGdKTSzpUCTkmjV+SsBpQ7DqPqhdpew KTrECZUbTTeTpyO0rTbF6YvmrTY/RIa1Q8N7xMFYmbpY7HR+d4D0ez6hetRoli8ZprUX4p 7NHS3fnzyzdQAWOvejugQrVayRgBPxM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-282-WIYe3bYQMricKOahuehrvw-1; Tue, 10 Dec 2019 10:01:03 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 73BB11800D45; Tue, 10 Dec 2019 15:01:02 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7878D5D9C5; Tue, 10 Dec 2019 15:00:58 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Thomas Monjalon , dpdk stable Date: Tue, 10 Dec 2019 14:59:12 +0000 Message-Id: <20191210145937.32755-38-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: WIYe3bYQMricKOahuehrvw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/bonding: use non deprecated PCI API' has been queued to LTS release 18.11.6 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.6 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/16/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 rebasi= ng (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/2f90f0a745b21fb8cb= 61645cd4096aa0f923a091 Thanks. Kevin. --- >From 2f90f0a745b21fb8cb61645cd4096aa0f923a091 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 b60fde6a8..977c472d4 100644 --- a/drivers/net/bonding/rte_eth_bond_args.c +++ b/drivers/net/bonding/rte_eth_bond_args.c @@ -64,9 +64,8 @@ static inline int bond_pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr) { -=09struct rte_pci_device *pdev; +=09const struct rte_pci_device *pdev =3D RTE_DEV_TO_PCI_CONST(dev); =09const struct rte_pci_addr *paddr =3D _pci_addr; =20 -=09pdev =3D RTE_DEV_TO_PCI(*(struct rte_device **)(void *)&dev); -=09return rte_eal_compare_pci_addr(&pdev->addr, paddr); +=09return rte_pci_addr_cmp(&pdev->addr, paddr); } =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:41.661581275 +0000 +++ 0038-net-bonding-use-non-deprecated-PCI-API.patch=092019-12-10 14:49:39= .067457488 +0000 @@ -1 +1 @@ -From ce77e6bf5113650e6d026e0b7fb395b60ab1f363 Mon Sep 17 00:00:00 2001 +From 2f90f0a745b21fb8cb61645cd4096aa0f923a091 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ce77e6bf5113650e6d026e0b7fb395b60ab1f363 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index f298ea0e1..bfe03c3d0 100644 +index b60fde6a8..977c472d4 100644 @@ -22 +23 @@ -@@ -61,9 +61,8 @@ static inline int +@@ -64,9 +64,8 @@ static inline int