From 1d7d49c360c34da138c7dd8bc03382bc973dbbf1 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Sun, 10 May 2020 14:09:30 +0000 Subject: [PATCH] qnlx: Do not redifines types. r360870 added linux/slab.h into liunx/bitmap.h and this include linux/types.h The qlnx driver is redefining some of those types so remove them and add an explicit linux/types.h include. Pointy hat: manu Reported by: Austin Shafer --- sys/dev/qlnx/qlnxe/bcm_osal.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/bcm_osal.h b/sys/dev/qlnx/qlnxe/bcm_osal.h index e9b2be7e75fa..ef4510cf8b30 100644 --- a/sys/dev/qlnx/qlnxe/bcm_osal.h +++ b/sys/dev/qlnx/qlnxe/bcm_osal.h @@ -34,6 +34,8 @@ #include "ecore_status.h" #include +#include + #if __FreeBSD_version >= 1200032 #include #else @@ -113,11 +115,6 @@ extern void qlnx_vf_flr_update(void *p_hwfn); #ifndef QLNX_RDMA -typedef uint16_t __le16; -typedef uint32_t __le32; -typedef uint16_t __be16; -typedef uint32_t __be32; - static __inline unsigned long roundup_pow_of_two(unsigned long x) {