 @@ -1,14 +1,14 @@
-/*	$NetBSD: iscsi_send.c,v 1.34 2017/02/25 12:03:57 mlelstv Exp $	*/
+/*	$NetBSD: iscsi_send.c,v 1.35 2017/12/03 07:23:12 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2004,2005,2006,2011 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.
 @@ -385,27 +385,27 @@ iscsi_send_thread(void *par)
 		/* If there's another connection available, transfer pending tasks */
 		if (sess->active_connections &&
 			TAILQ_FIRST(&conn->ccbs_waiting) != NULL) {
 			reassign_tasks(conn);
 		} else if (!conn->destroy && conn->Time2Wait) {
 			DEBC(conn, 1, ("Time2Wait\n"));
 			kpause("Time2Wait", false, conn->Time2Wait * hz, NULL);
 			DEBC(conn, 1, ("Time2Wait\n"));
+		}
 		/* notify event handlers of connection shutdown */
 		DEBC(conn, 1, ("%s\n", (conn->destroy) ? "TERMINATED" : "RECOVER"));
 		add_event((conn->destroy) ? ISCSI_CONNECTION_TERMINATED
-								  : ISCSI_RECOVER_CONNECTION,
+					  : ISCSI_RECOVER_CONNECTION,
 				  sess->id, conn->id, conn->terminating);
 		DEBC(conn, 1, ("Waiting for conn_idle\n"));
 		mutex_enter(&conn->lock);
 		if (!conn->destroy)
 			cv_timedwait(&conn->idle_cv, &conn->lock, CONNECTION_IDLE_TIMEOUT);
 		mutex_exit(&conn->lock);
 		DEBC(conn, 1, ("Waited for conn_idle, destroy = %d\n", conn->destroy));
 	} while (!conn->destroy);
 	/* wake up anyone waiting for a PDU */
 	mutex_enter(&conn->lock);
 @@ -1241,30 +1241,35 @@ send_task_management(connection_t *conn,
+{
 	ccb_t *ccb;
 	pdu_t *ppdu;
 	pdu_header_t *pdu;
 	DEBC(conn, 5, ("Send_task_management, ref_ccb=%p, func = %d\n",
 			ref_ccb, function));
 	if (function == TASK_REASSIGN && conn->session->ErrorRecoveryLevel < 2)
 		return ISCSI_STATUS_CANT_REASSIGN;
 	ccb = get_ccb(conn, xs == NULL);
 	/* can only happen if terminating... */
-	if (ccb == NULL)
+	if (ccb == NULL) {
 		DEBC(conn, 0, ("send_task_management, ref_ccb=%p, xs=%p, term=%d. No CCB\n",
 			ref_ccb, xs, conn->terminating));
 		return conn->terminating;
+	}
 	ppdu = get_pdu(conn, xs == NULL);
 	if (ppdu == NULL) {
 		DEBC(conn, 0, ("send_task_management, ref_ccb=%p, xs=%p, term=%d. No PDU\n",
 			ref_ccb, xs, conn->terminating));
 		free_ccb(ccb);
 		return conn->terminating;
+	}
 	ccb->xs = xs;
 	pdu = &ppdu->pdu;
 	pdu->Opcode = IOP_SCSI_Task_Management | OP_IMMEDIATE;
 	pdu->Flags = FLAG_FINAL | function;
 	ccb->CmdSN = conn->session->CmdSN;
 	pdu->p.task_req.CmdSN = htonl(ccb->CmdSN);
 @@ -1479,26 +1484,27 @@ send_run_xfer(session_t *session, struct
 	conn = assign_connection(session, waitok);
 	if (conn == NULL || conn->terminating || conn->state != ST_FULL_FEATURE) {
 		xs->error = XS_SELTIMEOUT;
 		DEBC(conn, 10, ("run_xfer on dead connection\n"));
 		scsipi_done(xs);
 		unref_session(session);
 		return;
+	}
 	if (xs->xs_control & XS_CTL_RESET) {
 		if (send_task_management(conn, NULL, xs, TARGET_WARM_RESET)) {
 			DEBC(conn, 0, ("send_task_management TARGET_WARM_RESET failed\n"));
 			xs->error = XS_SELTIMEOUT;
 			scsipi_done(xs);
 			unref_session(session);
+		}
 		return;
+	}
 	ccb = get_ccb(conn, waitok);
 	if (ccb == NULL) {
 		xs->error = XS_BUSY;
 		DEBC(conn, 5, ("No CCB in run_xfer, %d in use.\n", conn->usecount));
 		scsipi_done(xs);
 		unref_session(session);