svn commit: r316404 - stable/11/sys/dev/isp

[Alexander Motin]

Author: mav
Date: Sun Apr  2 10:55:40 2017
New Revision: 316404
URL: https://svnweb.freebsd.org/changeset/base/316404

Log:
  MFC r315678: Remove questionable reqp->req_time access.

Modified:
  stable/11/sys/dev/isp/isp.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/isp/isp.c
==============================================================================
--- stable/11/sys/dev/isp/isp.c	Sun Apr  2 10:54:58 2017	(r316403)
+++ stable/11/sys/dev/isp/isp.c	Sun Apr  2 10:55:40 2017	(r316404)
@@ -4424,8 +4424,6 @@ isp_start(XS_T *xs)
 		}
 	}
 
-	tptr = &reqp->req_time;
-
 	/*
 	 * NB: we do not support long CDBs (yet)
 	 */
@@ -4439,8 +4437,9 @@ isp_start(XS_T *xs)
 		}
 		reqp->req_target = target | (XS_CHANNEL(xs) << 7);
 		reqp->req_lun_trn = XS_LUN(xs);
-		cdbp = reqp->req_cdb;
 		reqp->req_cdblen = cdblen;
+		tptr = &reqp->req_time;
+		cdbp = reqp->req_cdb;
 	} else if (IS_24XX(isp)) {
 		ispreqt7_t *t7 = (ispreqt7_t *)local;
 
@@ -4487,15 +4486,17 @@ isp_start(XS_T *xs)
 			ispreqt2e_t *t2e = (ispreqt2e_t *)local;
 			t2e->req_target = lp->handle;
 			t2e->req_scclun = XS_LUN(xs);
+			tptr = &t2e->req_time;
 			cdbp = t2e->req_cdb;
 		} else if (ISP_CAP_SCCFW(isp)) {
-			ispreqt2_t *t2 = (ispreqt2_t *)local;
 			t2->req_target = lp->handle;
 			t2->req_scclun = XS_LUN(xs);
+			tptr = &t2->req_time;
 			cdbp = t2->req_cdb;
 		} else {
 			t2->req_target = lp->handle;
 			t2->req_lun_trn = XS_LUN(xs);
+			tptr = &t2->req_time;
 			cdbp = t2->req_cdb;
 		}
 	}