Module Name: src Committed By: mhitch Date: Sun Sep 9 06:06:30 UTC 2012
Modified Files: src/sys/dev/iscsi: iscsi_send.c Log Message: Remove an erroneous change that crept in. It was part of an earlier, incorrect fix I had done for writing > 64K bytes. It was still in the set of changes mlelstv had committed. I noticed it at the time, but did not think it was problematic - until now. This fixes the ccb corruption I was seeing and fixes PR kern/46896. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 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_send.c diff -u src/sys/dev/iscsi/iscsi_send.c:1.6 src/sys/dev/iscsi/iscsi_send.c:1.7 --- src/sys/dev/iscsi/iscsi_send.c:1.6 Sun Aug 12 13:26:18 2012 +++ src/sys/dev/iscsi/iscsi_send.c Sun Sep 9 06:06:29 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: iscsi_send.c,v 1.6 2012/08/12 13:26:18 mlelstv Exp $ */ +/* $NetBSD: iscsi_send.c,v 1.7 2012/09/09 06:06:29 mhitch Exp $ */ /*- * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc. @@ -1510,7 +1510,6 @@ send_run_xfer(session_t *session, struct ccb->lun += 0x1000000000000LL; ccb->cmd[1] += 0x10; #endif - ccb->disp = CCBDISP_SCSIPI; send_command(ccb, CCBDISP_SCSIPI, waitok, FALSE); }