svn commit: r216037 - stable/8/sys/dev/isp

[Matt Jacob]

Author: mjacob
Date: Mon Nov 29 04:29:36 2010
New Revision: 216037
URL: http://svn.freebsd.org/changeset/base/216037

Log:
  This is an MFC of 208542,208543
  
  Treat PRLI the same as PLOGI and make a database entry for it (target mode).

Modified:
  stable/8/sys/dev/isp/isp_freebsd.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/8/sys/dev/isp/isp_freebsd.c	Mon Nov 29 04:25:44 2010	(r216036)
+++ stable/8/sys/dev/isp/isp_freebsd.c	Mon Nov 29 04:29:36 2010	(r216037)
@@ -2603,7 +2603,14 @@ isp_handle_platform_notify_24xx(ispsoftc
 			msg = "PRLO";
 			break;
 		case PLOGI:
-			msg = "PLOGI";
+		case PRLI:
+			/*
+			 * Treat PRLI the same as PLOGI and make a database entry for it.
+			 */
+			if (inot->in_status_subcode == PLOGI)
+				msg = "PLOGI";
+			else
+				msg = "PRLI";
 			if (ISP_FW_NEWER_THAN(isp, 4, 0, 25)) {
 				ptr = (uint8_t *)inot;  /* point to unswizzled entry! */
 				wwn =	(((uint64_t) ptr[IN24XX_PLOGI_WWPN_OFF])   << 56) |
@@ -2619,9 +2626,6 @@ isp_handle_platform_notify_24xx(ispsoftc
 			}
 			isp_add_wwn_entry(isp, chan, wwn, nphdl, portid);
 			break;
-		case PRLI:
-			msg = "PRLI";
-			break;
 		case PDISC:
 			msg = "PDISC";
 			break;