From owner-svn-src-stable-8@FreeBSD.ORG  Sat Sep  5 17:29:08 2009
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BEE791065696;
	Sat,  5 Sep 2009 17:29:08 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AD7178FC0C;
	Sat,  5 Sep 2009 17:29:08 +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 n85HT8wo059715;
	Sat, 5 Sep 2009 17:29:08 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n85HT8lc059714;
	Sat, 5 Sep 2009 17:29:08 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200909051729.n85HT8lc059714@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 5 Sep 2009 17:29:08 +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: r196867 - stable/8/usr.sbin/ndp
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Sep 2009 17:29:08 -0000

Author: bz
Date: Sat Sep  5 17:29:08 2009
New Revision: 196867
URL: http://svn.freebsd.org/changeset/base/196867

Log:
  MFC r196866:
    In the NEXTADDR macro use SA_SIZE() rather than directly using
    sizeof(), as introduced in r186119, for advancing the current
    position into the buffer.
    See comment in net/route.h for a description of the difference.
    This makes ndp -s work again.
  
     Reviewed by:	qingli
  
  Approved by:	re (kib)

Modified:
  stable/8/usr.sbin/ndp/   (props changed)
  stable/8/usr.sbin/ndp/ndp.c

Modified: stable/8/usr.sbin/ndp/ndp.c
==============================================================================
--- stable/8/usr.sbin/ndp/ndp.c	Sat Sep  5 16:51:51 2009	(r196866)
+++ stable/8/usr.sbin/ndp/ndp.c	Sat Sep  5 17:29:08 2009	(r196867)
@@ -116,7 +116,7 @@
 
 #define NEXTADDR(w, s) \
 	if (rtm->rtm_addrs & (w)) { \
-		bcopy((char *)&s, cp, sizeof(s)); cp += sizeof(s);}
+		bcopy((char *)&s, cp, sizeof(s)); cp += SA_SIZE(&s);}
 
 
 static pid_t pid;