45c45
< __FBSDID("$FreeBSD: head/sys/dev/mrsas/mrsas_ioctl.h 265555 2014-05-07 16:16:49Z ambrisko $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mrsas/mrsas_ioctl.h 272737 2014-10-08 09:19:35Z kadesai $");
53a54,62
> #ifdef COMPAT_FREEBSD32
> /* Compilation error FIX */
> #if (__FreeBSD_version <= 900000)
> #include <sys/socket.h>
> #endif
> #include <sys/mount.h>
> #include <compat/freebsd32/freebsd32.h>
> #endif
>
64c73,76
< #define MRSAS_IOC_FIRMWARE_PASS_THROUGH _IOWR('M', 1, struct mrsas_iocpacket)
---
> #define MRSAS_IOC_FIRMWARE_PASS_THROUGH64 _IOWR('M', 1, struct mrsas_iocpacket)
> #ifdef COMPAT_FREEBSD32
> #define MRSAS_IOC_FIRMWARE_PASS_THROUGH32 _IOWR('M', 1, struct mrsas_iocpacket32)
> #endif
67a80,81
> #define MRSAS_LINUX_CMD32 0xc1144d01
>
96a111,128
> #ifdef COMPAT_FREEBSD32
> #pragma pack(1)
> struct mrsas_iocpacket32 {
> u_int16_t host_no;
> u_int16_t __pad1;
> u_int32_t sgl_off;
> u_int32_t sge_count;
> u_int32_t sense_off;
> u_int32_t sense_len;
> union {
> u_int8_t raw[MEGAMFI_RAW_FRAME_SIZE];
> struct mrsas_header hdr;
> } frame;
> struct iovec32 sgl[MAX_IOCTL_SGE];
> };
> #pragma pack()
> #endif /* COMPAT_FREEBSD32 */
>
< __FBSDID("$FreeBSD: head/sys/dev/mrsas/mrsas_ioctl.h 265555 2014-05-07 16:16:49Z ambrisko $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mrsas/mrsas_ioctl.h 272737 2014-10-08 09:19:35Z kadesai $");
53a54,62
> #ifdef COMPAT_FREEBSD32
> /* Compilation error FIX */
> #if (__FreeBSD_version <= 900000)
> #include <sys/socket.h>
> #endif
> #include <sys/mount.h>
> #include <compat/freebsd32/freebsd32.h>
> #endif
>
64c73,76
< #define MRSAS_IOC_FIRMWARE_PASS_THROUGH _IOWR('M', 1, struct mrsas_iocpacket)
---
> #define MRSAS_IOC_FIRMWARE_PASS_THROUGH64 _IOWR('M', 1, struct mrsas_iocpacket)
> #ifdef COMPAT_FREEBSD32
> #define MRSAS_IOC_FIRMWARE_PASS_THROUGH32 _IOWR('M', 1, struct mrsas_iocpacket32)
> #endif
67a80,81
> #define MRSAS_LINUX_CMD32 0xc1144d01
>
96a111,128
> #ifdef COMPAT_FREEBSD32
> #pragma pack(1)
> struct mrsas_iocpacket32 {
> u_int16_t host_no;
> u_int16_t __pad1;
> u_int32_t sgl_off;
> u_int32_t sge_count;
> u_int32_t sense_off;
> u_int32_t sense_len;
> union {
> u_int8_t raw[MEGAMFI_RAW_FRAME_SIZE];
> struct mrsas_header hdr;
> } frame;
> struct iovec32 sgl[MAX_IOCTL_SGE];
> };
> #pragma pack()
> #endif /* COMPAT_FREEBSD32 */
>