From owner-svn-src-head@freebsd.org Thu Jun 9 11:39:51 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB327B6D8D9; Thu, 9 Jun 2016 11:39:51 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C8841A41; Thu, 9 Jun 2016 11:39:51 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u59BdoV5035213; Thu, 9 Jun 2016 11:39:50 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u59Bdomd035212; Thu, 9 Jun 2016 11:39:50 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201606091139.u59Bdomd035212@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 9 Jun 2016 11:39:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301723 - head/sys/dev/iscsi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2016 11:39:51 -0000 Author: trasz Date: Thu Jun 9 11:39:50 2016 New Revision: 301723 URL: https://svnweb.freebsd.org/changeset/base/301723 Log: Add some spares to structs used by iscsi(4), to avoid ABI problems during 11-STABLE. MFC after: 1 month Modified: head/sys/dev/iscsi/iscsi_ioctl.h Modified: head/sys/dev/iscsi/iscsi_ioctl.h ============================================================================== --- head/sys/dev/iscsi/iscsi_ioctl.h Thu Jun 9 08:19:42 2016 (r301722) +++ head/sys/dev/iscsi/iscsi_ioctl.h Thu Jun 9 11:39:50 2016 (r301723) @@ -68,7 +68,7 @@ struct iscsi_session_conf { int isc_iser; char isc_offload[ISCSI_OFFLOAD_LEN]; int isc_enable; - int isc_spare[1]; + int isc_spare[4]; }; /* @@ -77,6 +77,7 @@ struct iscsi_session_conf { */ struct iscsi_session_limits { size_t isl_max_data_segment_length; + int isl_spare[8]; }; /* @@ -89,12 +90,13 @@ struct iscsi_session_state { int iss_header_digest; int iss_data_digest; int iss_max_data_segment_length; + int iss_max_burst_length; + int iss_first_burst_length; int iss_immediate_data; int iss_connected; char iss_reason[ISCSI_REASON_LEN]; char iss_offload[ISCSI_OFFLOAD_LEN]; - int iss_max_burst_length; - int iss_first_burst_length; + int iss_spare[4]; }; /* @@ -107,7 +109,7 @@ struct iscsi_daemon_request { uint16_t idr_tsih; uint16_t idr_spare_cid; struct iscsi_session_limits idr_limits; - int idr_spare[2]; + int idr_spare[4]; }; struct iscsi_daemon_handoff { @@ -120,11 +122,11 @@ struct iscsi_daemon_handoff { uint32_t idh_statsn; int idh_header_digest; int idh_data_digest; - int idh_initial_r2t; - int idh_immediate_data; size_t idh_max_data_segment_length; size_t idh_max_burst_length; size_t idh_first_burst_length; + int idh_immediate_data; + int idh_initial_r2t; int idh_spare[4]; };