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 E157845BC0 for ; Thu, 24 Oct 2024 11:30:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D00774003C; Thu, 24 Oct 2024 11:30:15 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id CD7A74003C for ; Thu, 24 Oct 2024 11:30:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729762214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QrXrVrxcpyoKMNLIJpaaRztuXWZ9NELPZV3cnNm7AkM=; b=PS5X5Kb96xt7iTVQn14Bpfncl494yo7RzfQ8rY1zbhM4Cr4neWOx2XfUPmvfeGuqakNGvG IvWyVH4G6fP1VHTyqH/kJ0Oej+EjoDkdrmwlHsdHzOJn8Qz9nX3DIBKZw6Tzg9iw58rB2W Mz0o4t7WBhk0AnKtjwf+PSF37iuf6zE= Received: from mx-prod-mc-02.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-154-BKSbVd1FNpShIwV7jrMvFw-1; Thu, 24 Oct 2024 05:30:12 -0400 X-MC-Unique: BKSbVd1FNpShIwV7jrMvFw-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B761D195419E for ; Thu, 24 Oct 2024 09:30:11 +0000 (UTC) Received: from aldebaran.redhat.com (unknown [10.39.192.98]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4BD5919560A2 for ; Thu, 24 Oct 2024 09:30:09 +0000 (UTC) From: Timothy Redaelli To: stable@dpdk.org Subject: [PATCH 23.11] net/ionic: fix build with Fedora Rawhide Date: Thu, 24 Oct 2024 11:30:06 +0200 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 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 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 --- Backport of f0d9e787747d ("net/gve/base: fix build with Fedora Rawhide") is also needed on stable branches. My commit is not needed on main since it was fixed silently in 484027bf9452 ("common/ionic: create common code library"). --- drivers/net/ionic/ionic_osdep.h | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/drivers/net/ionic/ionic_osdep.h b/drivers/net/ionic/ionic_osdep.h index 68f767b920..97188dfd59 100644 --- a/drivers/net/ionic/ionic_osdep.h +++ b/drivers/net/ionic/ionic_osdep.h @@ -30,14 +30,28 @@ #define __iomem -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; -typedef uint64_t u64; - -typedef uint16_t __le16; -typedef uint32_t __le32; -typedef uint64_t __le64; +#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 + +#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) #define ioread32(reg) rte_read32(rte_le_to_cpu_32(reg)) -- 2.47.0