svn commit: r312581 - stable/10/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Sat Jan 21 08:37:53 2017
New Revision: 312581
URL: https://svnweb.freebsd.org/changeset/base/312581

Log:
  MFC r310644: Fix/synchronize field types in struct ctl_modepage_header.

Modified:
  stable/10/sys/cam/ctl/ctl.c
  stable/10/sys/cam/ctl/ctl.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c	Sat Jan 21 08:36:59 2017	(r312580)
+++ stable/10/sys/cam/ctl/ctl.c	Sat Jan 21 08:37:53 2017	(r312581)
@@ -5930,7 +5930,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;

Modified: stable/10/sys/cam/ctl/ctl.h
==============================================================================
--- stable/10/sys/cam/ctl/ctl.h	Sat Jan 21 08:36:59 2017	(r312580)
+++ stable/10/sys/cam/ctl/ctl.h	Sat Jan 21 08:37:53 2017	(r312581)
@@ -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 {