summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2017-01-21 08:36:59 +0000
committermav <mav@FreeBSD.org>2017-01-21 08:36:59 +0000
commitb36724349c19915bea2c9fefcc8583cbdbc7fa71 (patch)
treef6c1bb84a80075b2cd673756fcdd95e8eb7383bb
parent5fb251d446de05740f1fdb9437a8ba62a48c5e95 (diff)
downloadFreeBSD-src-b36724349c19915bea2c9fefcc8583cbdbc7fa71.zip
FreeBSD-src-b36724349c19915bea2c9fefcc8583cbdbc7fa71.tar.gz
MFC r310644: Fix/synchronize field types in struct ctl_modepage_header.
-rw-r--r--sys/cam/ctl/ctl.c2
-rw-r--r--sys/cam/ctl/ctl.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 96f1fcc..fc3a4f8 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -5939,7 +5939,7 @@ ctl_do_mode_select(union ctl_io *io)
int page_len, page_len_offset, page_len_size;
union ctl_modepage_info *modepage_info;
struct ctl_lun *lun;
- int *len_left, *len_used;
+ uint16_t *len_left, *len_used;
int retval, i;
ctsio = &io->scsiio;
diff --git a/sys/cam/ctl/ctl.h b/sys/cam/ctl/ctl.h
index 7143012..d9a4f5a 100644
--- a/sys/cam/ctl/ctl.h
+++ b/sys/cam/ctl/ctl.h
@@ -74,8 +74,8 @@ struct ctl_port_entry {
struct ctl_modepage_header {
uint8_t page_code;
uint8_t subpage;
- int32_t len_used;
- int32_t len_left;
+ uint16_t len_used;
+ uint16_t len_left;
};
union ctl_modepage_info {
OpenPOWER on IntegriCloud