From patchwork Thu May 6 15:25:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 1475059 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DXM3PIuv; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fbcqt25q5z9sW4 for ; Fri, 7 May 2021 01:26:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 21CDA60E04; Thu, 6 May 2021 15:26:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1cxadO69PyYh; Thu, 6 May 2021 15:26:30 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTP id BEDE060E25; Thu, 6 May 2021 15:26:29 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 96F7CC000D; Thu, 6 May 2021 15:26:29 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 02FC0C000D for ; Thu, 6 May 2021 15:26:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DDEF960DFF for ; Thu, 6 May 2021 15:26:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9F67hRlAJZfj for ; Thu, 6 May 2021 15:26:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 187B160E04 for ; Thu, 6 May 2021 15:26:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620314776; 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=FUI7rrcfgwwNwzzl4nl1ZxNXq5IH/sUYxSFkYK99WkQ=; b=DXM3PIuvsZjtzTC8T3QTQfPYcQ1Eag4YtVvrUHehmdMOo2Su21wmo2853JAyfydI66FtkP MXTGmBhfxfZdyhBx0WRJYWeUG3wDx+F3x3sGYXuO8XyoQgQBG1bhmWLxyAjXwXhkFY+7Bv wbYJXxDYVNfA17QWsztQGrD/6WzKkIc= 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-211-enxeABW9PV-FgpEnMzCymQ-1; Thu, 06 May 2021 11:26:13 -0400 X-MC-Unique: enxeABW9PV-FgpEnMzCymQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F77A8015A8; Thu, 6 May 2021 15:26:12 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.192.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94FA560657; Thu, 6 May 2021 15:26:10 +0000 (UTC) From: David Marchand To: ian.stokes@intel.com Date: Thu, 6 May 2021 17:25:47 +0200 Message-Id: <20210506152548.29597-6-david.marchand@redhat.com> In-Reply-To: <20210506152548.29597-1-david.marchand@redhat.com> References: <20210506152548.29597-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: dev@openvswitch.org Subject: [ovs-dev] [PATCH dpdk-latest 5/6] netdev-dpdk: Fix build with 21.05. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" PCI_ANY_ID has been prefixed with RTE_ [1]. 1: https://git.dpdk.org/dpdk/commit/?id=4d509afa7bb2 Signed-off-by: David Marchand --- lib/netdev-dpdk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index 9d8096668e..e67d27d4e3 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -3680,8 +3680,8 @@ netdev_dpdk_get_status(const struct netdev *netdev, struct smap *args) ovs_mutex_unlock(&dev->mutex); const struct rte_bus *bus; const struct rte_pci_device *pci_dev; - uint16_t vendor_id = PCI_ANY_ID; - uint16_t device_id = PCI_ANY_ID; + uint16_t vendor_id = RTE_PCI_ANY_ID; + uint16_t device_id = RTE_PCI_ANY_ID; bus = rte_bus_find_by_device(dev_info.device); if (bus && !strcmp(bus->name, "pci")) { pci_dev = RTE_DEV_TO_PCI(dev_info.device);