Author: mav
Date: Fri Nov 13 19:50:55 2015
New Revision: 290792
URL: https://svnweb.freebsd.org/changeset/base/290792

Log:
  MFC r289886: Add new field to Abort IOCB.

Modified:
  stable/10/sys/dev/isp/isp_library.c
  stable/10/sys/dev/isp/ispmbox.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/isp/isp_library.c
==============================================================================
--- stable/10/sys/dev/isp/isp_library.c Fri Nov 13 19:50:08 2015        
(r290791)
+++ stable/10/sys/dev/isp/isp_library.c Fri Nov 13 19:50:55 2015        
(r290792)
@@ -1071,6 +1071,7 @@ isp_put_24xx_abrt(ispsoftc_t *isp, isp24
        ISP_IOXPUT_16(isp, src->abrt_nphdl, &dst->abrt_nphdl);
        ISP_IOXPUT_16(isp, src->abrt_options, &dst->abrt_options);
        ISP_IOXPUT_32(isp, src->abrt_cmd_handle, &dst->abrt_cmd_handle);
+       ISP_IOXPUT_16(isp, src->abrt_queue_number, &dst->abrt_queue_number);
        for (i = 0; i < ASIZE(src->abrt_reserved); i++) {
                ISP_IOXPUT_8(isp, src->abrt_reserved[i], 
&dst->abrt_reserved[i]);
        }
@@ -1179,6 +1180,7 @@ isp_get_24xx_abrt(ispsoftc_t *isp, isp24
        ISP_IOXGET_16(isp, &src->abrt_nphdl, dst->abrt_nphdl);
        ISP_IOXGET_16(isp, &src->abrt_options, dst->abrt_options);
        ISP_IOXGET_32(isp, &src->abrt_cmd_handle, dst->abrt_cmd_handle);
+       ISP_IOXGET_16(isp, &src->abrt_queue_number, dst->abrt_queue_number);
        for (i = 0; i < ASIZE(src->abrt_reserved); i++) {
                ISP_IOXGET_8(isp, &src->abrt_reserved[i], 
dst->abrt_reserved[i]);
        }

Modified: stable/10/sys/dev/isp/ispmbox.h
==============================================================================
--- stable/10/sys/dev/isp/ispmbox.h     Fri Nov 13 19:50:08 2015        
(r290791)
+++ stable/10/sys/dev/isp/ispmbox.h     Fri Nov 13 19:50:55 2015        
(r290792)
@@ -574,7 +574,8 @@ typedef struct {
        uint16_t        abrt_nphdl;
        uint16_t        abrt_options;
        uint32_t        abrt_cmd_handle;
-       uint8_t         abrt_reserved[32];
+       uint16_t        abrt_queue_number;
+       uint8_t         abrt_reserved[30];
        uint16_t        abrt_tidlo;
        uint8_t         abrt_tidhi;
        uint8_t         abrt_vpidx;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to