From owner-svn-src-head@FreeBSD.ORG  Wed May 15 17:26:50 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 98BE2502;
 Wed, 15 May 2013 17:26:50 +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 8B2FBE95;
 Wed, 15 May 2013 17:26:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FHQoRG023489;
 Wed, 15 May 2013 17:26:50 GMT (envelope-from asomers@svn.freebsd.org)
Received: (from asomers@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FHQoSR023488;
 Wed, 15 May 2013 17:26:50 GMT (envelope-from asomers@svn.freebsd.org)
Message-Id: <201305151726.r4FHQoSR023488@svn.freebsd.org>
From: Alan Somers <asomers@FreeBSD.org>
Date: Wed, 15 May 2013 17:26:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250662 - head/sbin/camcontrol
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 17:26:50 -0000

Author: asomers
Date: Wed May 15 17:26:50 2013
New Revision: 250662
URL: http://svnweb.freebsd.org/changeset/base/250662

Log:
  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)
  MFC after:	3 weeks

Modified:
  head/sbin/camcontrol/camcontrol.c

Modified: head/sbin/camcontrol/camcontrol.c
==============================================================================
--- head/sbin/camcontrol/camcontrol.c	Wed May 15 17:03:09 2013	(r250661)
+++ head/sbin/camcontrol/camcontrol.c	Wed May 15 17:26:50 2013	(r250662)
@@ -7138,8 +7138,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)) {