From owner-svn-src-stable@FreeBSD.ORG  Wed Jun 12 21:41:09 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E065F8F2;
 Wed, 12 Jun 2013 21:41:09 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D1FA315CD;
 Wed, 12 Jun 2013 21:41:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CLf9m7063864;
 Wed, 12 Jun 2013 21:41:09 GMT (envelope-from asomers@svn.freebsd.org)
Received: (from asomers@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CLf9ql063863;
 Wed, 12 Jun 2013 21:41:09 GMT (envelope-from asomers@svn.freebsd.org)
Message-Id: <201306122141.r5CLf9ql063863@svn.freebsd.org>
From: Alan Somers <asomers@FreeBSD.org>
Date: Wed, 12 Jun 2013 21:41:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251669 - stable/9/sbin/camcontrol
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 12 Jun 2013 21:41:10 -0000

Author: asomers
Date: Wed Jun 12 21:41:09 2013
New Revision: 251669
URL: http://svnweb.freebsd.org/changeset/base/251669

Log:
  MFC r250662
  
  sbin/camcontrol/camcontrol.c
  	If an expander returns 0x00 (no device attached) in the ATTACHED DEVICE
  	field of the SMP DISCOVER response, ignore the value of ATTACHED SAS
  	ADDRESS, because it is invalid.  Some expanders zero out the address
  	when the attached device is removed, but others do not.  Section
  	9.4.3.10 of the SAS Protocol Layer 2 revision 04b does not require them
  	to do so.
  
  Approved by:	ken (mentor)

Modified:
  stable/9/sbin/camcontrol/camcontrol.c
Directory Properties:
  stable/9/sbin/camcontrol/   (props changed)

Modified: stable/9/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/9/sbin/camcontrol/camcontrol.c	Wed Jun 12 21:12:05 2013	(r251668)
+++ stable/9/sbin/camcontrol/camcontrol.c	Wed Jun 12 21:41:09 2013	(r251669)
@@ -7137,8 +7137,12 @@ smpphylist(struct cam_device *device, in
 			continue;
 		}
 
-		item = findsasdevice(&devlist,
-			scsi_8btou64(disresponse->attached_sas_address));
+		if (disresponse->attached_device == SMP_DIS_AD_TYPE_NONE) {
+			item = NULL;
+		} else {
+			item = findsasdevice(&devlist,
+			    scsi_8btou64(disresponse->attached_sas_address));
+		}
 
 		if ((quiet == 0)
 		 || (item != NULL)) {