From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E5EE245DB9 for ; Wed, 27 Nov 2024 18:19:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0097402AB; Wed, 27 Nov 2024 18:19:31 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B80A9402AB for ; Wed, 27 Nov 2024 18:19:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732727969; 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; bh=FWptdHpOxF4PdK2QQl9vGquBoUYh6pQ3XjwzrNitzxE=; b=HND+c8N/Vd2lZL1QEVwKdY3//V6jM5dld4o9ksFT+03wP8Xf4X4qMQSOjmvXRFTbqYhw47 0ISWBBqnDzeQtpOX4Clt/0zDIo3IbZyau3aESfQHKWnA+/xAtC1ubsGNUfc6GQmdUqIBhX FYCMopcpHjX7YLN3rWxllVEOa7l3W8Y= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-77-scKdU0hFPneNaXp8sJ1eGg-1; Wed, 27 Nov 2024 12:19:25 -0500 X-MC-Unique: scKdU0hFPneNaXp8sJ1eGg-1 X-Mimecast-MFC-AGG-ID: scKdU0hFPneNaXp8sJ1eGg Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CEC8719560B1 for ; Wed, 27 Nov 2024 17:19:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 568F030001A2; Wed, 27 Nov 2024 17:19:22 +0000 (UTC) From: Kevin Traynor To: Timothy Redaelli Cc: dpdk stable Subject: patch 'net/ionic: fix build with Fedora Rawhide' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:17:08 +0000 Message-ID: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: eDF1VkJAN7Mj6csSoMhEA3pxsT_WYo4D3Xj5n35p4dc_1732727964 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.9 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/02/24. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/35e9bc375ed3fc0ea1a0324e6f295b178286a620 Thanks. Kevin --- >From 35e9bc375ed3fc0ea1a0324e6f295b178286a620 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Thu, 24 Oct 2024 11:30:06 +0200 Subject: [PATCH] net/ionic: fix build with Fedora Rawhide Currently, a number of integer types are typedef'd to their corresponding userspace or RTE values. This can be problematic if these types are already defined somewhere else, as it would cause type collisions. This patch changes the typedefs to #define macros which are only defined if the types are not defined already. Fixes: 5ef518098ec6 ("net/ionic: register and initialize adapter") Signed-off-by: Timothy Redaelli --- drivers/net/ionic/ionic_osdep.h | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/net/ionic/ionic_osdep.h b/drivers/net/ionic/ionic_osdep.h index 89ed106d11..b42024b4b6 100644 --- a/drivers/net/ionic/ionic_osdep.h +++ b/drivers/net/ionic/ionic_osdep.h @@ -31,12 +31,26 @@ #define __iomem -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; -typedef uint64_t u64; +#ifndef u8 +#define u8 uint8_t +#endif +#ifndef u16 +#define u16 uint16_t +#endif +#ifndef u32 +#define u32 uint32_t +#endif +#ifndef u64 +#define u64 uint64_t +#endif -typedef uint16_t __le16; -typedef uint32_t __le32; -typedef uint64_t __le64; +#ifndef __le16 +#define __le16 rte_le16_t +#endif +#ifndef __le32 +#define __le32 rte_le32_t +#endif +#ifndef __le64 +#define __le64 rte_le64_t +#endif #define ioread8(reg) rte_read8(reg) -- 2.47.0