From owner-svn-src-projects@FreeBSD.ORG  Fri Jan 28 02:11:16 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 30CCB106566B;
	Fri, 28 Jan 2011 02:11:16 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 210108FC0A;
	Fri, 28 Jan 2011 02:11:16 +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 p0S2BGYb051645;
	Fri, 28 Jan 2011 02:11:16 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0S2BGaw051643;
	Fri, 28 Jan 2011 02:11:16 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201101280211.p0S2BGaw051643@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Fri, 28 Jan 2011 02:11:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218002 - projects/ofed/head/usr.sbin/ndp
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Jan 2011 02:11:16 -0000

Author: jeff
Date: Fri Jan 28 02:11:15 2011
New Revision: 218002
URL: http://svn.freebsd.org/changeset/base/218002

Log:
   - Add support for printing infiniband addresses.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/usr.sbin/ndp/ndp.c

Modified: projects/ofed/head/usr.sbin/ndp/ndp.c
==============================================================================
--- projects/ofed/head/usr.sbin/ndp/ndp.c	Fri Jan 28 02:10:30 2011	(r218001)
+++ projects/ofed/head/usr.sbin/ndp/ndp.c	Fri Jan 28 02:11:15 2011	(r218002)
@@ -826,10 +826,18 @@ ether_str(sdl)
 	static char hbuf[NI_MAXHOST];
 	u_char *cp;
 
-	if (sdl->sdl_alen) {
+	if (sdl->sdl_alen == ETHER_ADDR_LEN) {
 		cp = (u_char *)LLADDR(sdl);
 		snprintf(hbuf, sizeof(hbuf), "%x:%x:%x:%x:%x:%x",
 		    cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]);
+	} else if (sdl->sdl_alen == 20) {
+		cp = (u_char *)LLADDR(sdl);
+		snprintf(hbuf, sizeof(hbuf),
+		   "%x:%x:%x:%x:%x%x:%x:%x:%x:%x%x:%x:%x:%x:%x%x:%x:%x:%x:%x",
+		    cp[0], cp[1], cp[2], cp[3], cp[4], cp[5], cp[6], cp[7],
+		    cp[8], cp[9], cp[10], cp[11], cp[12], cp[13], cp[14],
+		    cp[15], cp[16], cp[17], cp[18], cp[19]);
+
 	} else
 		snprintf(hbuf, sizeof(hbuf), "(incomplete)");