svn commit: r360872 - head/sys/dev/qlnx/qlnxe

[Emmanuel Vadot]

Author: manu
Date: Sun May 10 14:09:30 2020
New Revision: 360872
URL: https://svnweb.freebsd.org/changeset/base/360872

Log:
  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 <ashafer at badland.io>

Modified:
  head/sys/dev/qlnx/qlnxe/bcm_osal.h

Modified: head/sys/dev/qlnx/qlnxe/bcm_osal.h
==============================================================================
--- head/sys/dev/qlnx/qlnxe/bcm_osal.h	Sun May 10 13:12:05 2020	(r360871)
+++ head/sys/dev/qlnx/qlnxe/bcm_osal.h	Sun May 10 14:09:30 2020	(r360872)
@@ -34,6 +34,8 @@
 #include "ecore_status.h"
 #include <sys/bitstring.h>
 
+#include <linux/types.h>
+
 #if __FreeBSD_version >= 1200032
 #include <linux/bitmap.h>
 #else
@@ -112,11 +114,6 @@ extern void qlnx_vf_flr_update(void *p_hwfn);
 #define s32 uint32_t
 
 #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)