summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2015-11-13 19:50:55 +0000
committermav <mav@FreeBSD.org>2015-11-13 19:50:55 +0000
commit2a757db3c6b8d31a1da57da156a98b878c3fd61b (patch)
treef4b55da10364ae0df162e4037c03f9a16a9a2306
parent2785b58e824e3fc5f0ca35266b07260ee0ab4518 (diff)
downloadFreeBSD-src-2a757db3c6b8d31a1da57da156a98b878c3fd61b.zip
FreeBSD-src-2a757db3c6b8d31a1da57da156a98b878c3fd61b.tar.gz
MFC r289886: Add new field to Abort IOCB.
-rw-r--r--sys/dev/isp/isp_library.c2
-rw-r--r--sys/dev/isp/ispmbox.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/isp/isp_library.c b/sys/dev/isp/isp_library.c
index 602a1ad..35d2c97 100644
--- a/sys/dev/isp/isp_library.c
+++ b/sys/dev/isp/isp_library.c
@@ -1071,6 +1071,7 @@ isp_put_24xx_abrt(ispsoftc_t *isp, isp24xx_abrt_t *src, isp24xx_abrt_t *dst)
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, isp24xx_abrt_t *src, isp24xx_abrt_t *dst)
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]);
}
diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h
index 27b65c7..d89f330 100644
--- a/sys/dev/isp/ispmbox.h
+++ b/sys/dev/isp/ispmbox.h
@@ -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;
OpenPOWER on IntegriCloud