 @@ -1,14 +1,14 @@
-/*	$NetBSD: msipic.c,v 1.11 2017/07/28 14:26:50 maxv Exp $	*/
+/*	$NetBSD: msipic.c,v 1.12 2019/04/01 06:20:40 msaitoh Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.11 2017/07/28 14:26:50 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.12 2019/04/01 06:20:40 msaitoh Exp $");
 #include "opt_intrdebug.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <dev/pci/pcivar.h>
 #include <machine/i82489reg.h>
 @@ -84,27 +84,27 @@ struct msipic {
 	bus_size_t mp_bssize;
 	struct pic *mp_pic;
 	LIST_ENTRY(msipic) mp_list;
 };
 static kmutex_t msipic_list_lock;
 static LIST_HEAD(, msipic) msipic_list =
 	LIST_HEAD_INITIALIZER(msipic_list);
 /*
  * This struct managements "devid" to use the same "devid" for the device
- * re-attached. If the device's bus number and device numer and function
+ * re-attached. If the device's bus number and device number and function
  * number are equal, it is assumed re-attached.
  */
 struct dev_last_used_seq {
 	bool ds_using;
 	int ds_bus;
 	int ds_dev;
 	int ds_fun;
 };
 /* The number of MSI/MSI-X devices supported by system. */
 #define NUM_MSI_DEVS 256
 /* Record devids to use the same devid when the device is re-attached. */
 static struct dev_last_used_seq dev_seqs[NUM_MSI_DEVS];

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iscsi_utils.c,v 1.25 2019/02/01 08:33:29 mrg Exp $	*/
+/*	$NetBSD: iscsi_utils.c,v 1.26 2019/04/01 06:20:40 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2004,2005,2006,2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -561,27 +561,27 @@ init_sernum(sernum_buffer_t *buff)
 /*
  * add_sernum:
  *    Add a received serial number to the buffer.
  *    If the serial number is smaller than the expected one, it is ignored.
  *    If it is larger, all missing serial numbers are added as well.
+ *
  *    Parameter:
  *          buff   The serial number buffer.
  *          num   The received serial number
+ *
  *    Returns:
  *          0     if the received block is a duplicate
  *          1     if the number is the expected one
- *          >1    if the numer is > the expected value, in this case the
+ *          >1    if the number is > the expected value, in this case the
  *                return value is the number of unacknowledged blocks
  *          <0    if the buffer is full (i.e. an excessive number of blocks
  *                is unacknowledged)
  */
 int
 add_sernum(sernum_buffer_t *buff, uint32_t num)
+{
 	int i, t, b;
 	uint32_t n;
 	int32_t diff;
 	/*