Module Name: src Committed By: mlelstv Date: Sun Jun 5 05:40:29 UTC 2016
Modified Files: src/sys/dev/iscsi: iscsi_rcv.c iscsi_send.c Log Message: Whitespace, braces. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/dev/iscsi/iscsi_rcv.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/iscsi/iscsi_send.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/iscsi/iscsi_rcv.c diff -u src/sys/dev/iscsi/iscsi_rcv.c:1.17 src/sys/dev/iscsi/iscsi_rcv.c:1.18 --- src/sys/dev/iscsi/iscsi_rcv.c:1.17 Sun Jun 5 05:31:43 2016 +++ src/sys/dev/iscsi/iscsi_rcv.c Sun Jun 5 05:40:29 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: iscsi_rcv.c,v 1.17 2016/06/05 05:31:43 mlelstv Exp $ */ +/* $NetBSD: iscsi_rcv.c,v 1.18 2016/06/05 05:40:29 mlelstv Exp $ */ /*- * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc. @@ -127,16 +127,18 @@ ccb_from_itt(connection_t *conn, uint32_ return NULL; cidx = itt & 0xff; - if (cidx >= CCBS_PER_SESSION) { + if (cidx >= CCBS_PER_SESSION) return NULL; - } + ccb = &conn->session->ccb[cidx]; + if (ccb->ITT != itt || ccb->disp <= CCBDISP_BUSY) { DEBC(conn, 0, ("ccb_from_itt: received invalid CCB itt %08x != %08x\n", itt, ccb->ITT)); return NULL; } + return ccb; } Index: src/sys/dev/iscsi/iscsi_send.c diff -u src/sys/dev/iscsi/iscsi_send.c:1.25 src/sys/dev/iscsi/iscsi_send.c:1.26 --- src/sys/dev/iscsi/iscsi_send.c:1.25 Sun Jun 5 05:36:57 2016 +++ src/sys/dev/iscsi/iscsi_send.c Sun Jun 5 05:40:29 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: iscsi_send.c,v 1.25 2016/06/05 05:36:57 mlelstv Exp $ */ +/* $NetBSD: iscsi_send.c,v 1.26 2016/06/05 05:40:29 mlelstv Exp $ */ /*- * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc. @@ -211,7 +211,6 @@ reassign_tasks(connection_t *oldconn) pdu->save_iovec [0].iov_len = (conn->HeaderDigest) ? BHS_SIZE + 4 : BHS_SIZE; - /* link new PDU into old CCB */ ccb->pdu_waiting = pdu; /* link new CCB into new connection */ @@ -1413,7 +1412,6 @@ send_command(ccb_t *ccb, ccb_disp_t disp totlen = conn->max_firstdata ? totlen - len : 0; } } - if (!totlen) pdu->Flags |= FLAG_FINAL; pdu->Flags |= ccb->tag;