svn commit: r272656 - stable/10/sys/cam/scsi

[Alexander Motin]

Author: mav
Date: Mon Oct  6 15:23:12 2014
New Revision: 272656
URL: https://svnweb.freebsd.org/changeset/base/272656

Log:
  MFC r269469:  Do not retry token errors.
  
  They are not going to disappear by themselves.

Modified:
  stable/10/sys/cam/scsi/scsi_all.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/scsi/scsi_all.c
==============================================================================
--- stable/10/sys/cam/scsi/scsi_all.c	Mon Oct  6 15:12:59 2014	(r272655)
+++ stable/10/sys/cam/scsi/scsi_all.c	Mon Oct  6 15:23:12 2014	(r272656)
@@ -1592,37 +1592,37 @@ static struct asc_table_entry asc_table[
 	{ SST(0x22, 0x00, SS_FATAL | EINVAL,
 	    "Illegal function (use 20 00, 24 00, or 26 00)") },
 	/* DT P      B    */
-	{ SST(0x23, 0x00, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x00, SS_FATAL | EINVAL,
 	    "Invalid token operation, cause not reportable") },
 	/* DT P      B    */
-	{ SST(0x23, 0x01, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x01, SS_FATAL | EINVAL,
 	    "Invalid token operation, unsupported token type") },
 	/* DT P      B    */
-	{ SST(0x23, 0x02, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x02, SS_FATAL | EINVAL,
 	    "Invalid token operation, remote token usage not supported") },
 	/* DT P      B    */
-	{ SST(0x23, 0x03, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x03, SS_FATAL | EINVAL,
 	    "Invalid token operation, remote ROD token creation not supported") },
 	/* DT P      B    */
-	{ SST(0x23, 0x04, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x04, SS_FATAL | EINVAL,
 	    "Invalid token operation, token unknown") },
 	/* DT P      B    */
-	{ SST(0x23, 0x05, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x05, SS_FATAL | EINVAL,
 	    "Invalid token operation, token corrupt") },
 	/* DT P      B    */
-	{ SST(0x23, 0x06, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x06, SS_FATAL | EINVAL,
 	    "Invalid token operation, token revoked") },
 	/* DT P      B    */
-	{ SST(0x23, 0x07, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x07, SS_FATAL | EINVAL,
 	    "Invalid token operation, token expired") },
 	/* DT P      B    */
-	{ SST(0x23, 0x08, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x08, SS_FATAL | EINVAL,
 	    "Invalid token operation, token cancelled") },
 	/* DT P      B    */
-	{ SST(0x23, 0x09, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x09, SS_FATAL | EINVAL,
 	    "Invalid token operation, token deleted") },
 	/* DT P      B    */
-	{ SST(0x23, 0x0A, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x0A, SS_FATAL | EINVAL,
 	    "Invalid token operation, invalid token length") },
 	/* DTLPWROMAEBKVF */
 	{ SST(0x24, 0x00, SS_FATAL | EINVAL,