patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Gavin Hu <gavin.hu@arm.com>
To: dev@dpdk.org
Cc: nd@arm.com, ajit.khaparde@broadcom.com,
	somnath.kotur@broadcom.com, stable@dpdk.org
Subject: [dpdk-stable] [PATCH] net/bnx2x: fix the meson compile issue
Date: Tue, 29 Oct 2019 19:09:24 +0800
Message-ID: <1572347364-23487-1-git-send-email-gavin.hu@arm.com> (raw)

The definition is conflicting with that of the compiler, as show the
following error: ../drivers/net/bnx2x/bnx2x_osal.h:27:17: error:
conflicting types for ‘uint64_t’ #define __le64  uint64_t ^~~~ In file
included from /usr/include/stdint.h:37, from
/usr/lib/gcc/aarch64-linux-gnu/8/include/stdint.h:9, from
../lib/librte_eal/common/include/arch/arm/rte_byteorder.h:16, from
../drivers/net/bnx2x/bnx2x.h:17, from ../drivers/net/bnx2x/bnx2x_rxtx.c:8:
/usr/include/aarch64-linux-gnu/bits/stdint-uintn.h:27:20: note: previous
declaration of ‘uint64_t’ was here
typedef __uint64_t uint64_t;

The fix is to remove the duplicate definition.

Fixes: 38dff79ba736 ("net/bnx2x: update HSI")
Cc: stable@dpdk.org

Signed-off-by: Gavin Hu <gavin.hu@arm.com>
---
 drivers/net/bnx2x/bnx2x_osal.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/bnx2x/bnx2x_osal.h b/drivers/net/bnx2x/bnx2x_osal.h
index 7cd2932..aad4e0b 100644
--- a/drivers/net/bnx2x/bnx2x_osal.h
+++ b/drivers/net/bnx2x/bnx2x_osal.h
@@ -22,8 +22,4 @@
 #undef __LITTLE_ENDIAN
 #endif
 
-#define __le16		uint16_t
-#define __le32		uint32_t
-#define __le64		uint64_t
-
 #endif /* BNX2X_OSAL_H */
-- 
2.7.4


             reply	other threads:[~2019-10-29 11:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-29 11:09 Gavin Hu [this message]
2019-10-30 11:23 ` [dpdk-stable] [dpdk-dev] " Ferruh Yigit
2019-10-30 18:35   ` [dpdk-stable] [EXT] " Rasesh Mody

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1572347364-23487-1-git-send-email-gavin.hu@arm.com \
    --to=gavin.hu@arm.com \
    --cc=ajit.khaparde@broadcom.com \
    --cc=dev@dpdk.org \
    --cc=nd@arm.com \
    --cc=somnath.kotur@broadcom.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git