diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2020-05-10 14:09:30 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2020-05-10 14:09:30 +0000 |
| commit | 1d7d49c360c34da138c7dd8bc03382bc973dbbf1 (patch) | |
| tree | c1de88b2ee61e66050670c76877bf41c02e1a192 | |
| parent | 3d84874da0fb42a74a7b94e3b215ad5a4c9002f1 (diff) | |
| download | src-1d7d49c360c34da138c7dd8bc03382bc973dbbf1.tar.gz src-1d7d49c360c34da138c7dd8bc03382bc973dbbf1.zip | |
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@badland.io>
Notes
Notes:
svn path=/head/; revision=360872
| -rw-r--r-- | sys/dev/qlnx/qlnxe/bcm_osal.h | 7 |
1 files 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 <sys/bitstring.h> +#include <linux/types.h> + #if __FreeBSD_version >= 1200032 #include <linux/bitmap.h> #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) { |