From owner-svn-src-stable@FreeBSD.ORG  Mon Nov 29 04:29:36 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F0F95106566B;
	Mon, 29 Nov 2010 04:29:36 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE3A18FC14;
	Mon, 29 Nov 2010 04:29:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAT4TaWF091775;
	Mon, 29 Nov 2010 04:29:36 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAT4TaDd091773;
	Mon, 29 Nov 2010 04:29:36 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201011290429.oAT4TaDd091773@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Mon, 29 Nov 2010 04:29:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216037 - stable/8/sys/dev/isp
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Nov 2010 04:29:37 -0000

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;