From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 11 07:51:09 2008
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 C55AF106564A;
	Thu, 11 Dec 2008 07:51:09 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B6BE78FC08;
	Thu, 11 Dec 2008 07:51:09 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBB7p9af058396;
	Thu, 11 Dec 2008 07:51:09 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBB7p9Mq058395;
	Thu, 11 Dec 2008 07:51:09 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <200812110751.mBB7p9Mq058395@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Thu, 11 Dec 2008 07:51:09 +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: r185920 - projects/arpv2_merge_1/usr.sbin/arp
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: Thu, 11 Dec 2008 07:51:09 -0000

Author: qingli
Date: Thu Dec 11 07:51:09 2008
New Revision: 185920
URL: http://svn.freebsd.org/changeset/base/185920

Log:
  Simply remove the references to RTF_LLINFO.
  This flag is no longer set in the kernel so
  don't bother checking in userland app.

Modified:
  projects/arpv2_merge_1/usr.sbin/arp/arp.c

Modified: projects/arpv2_merge_1/usr.sbin/arp/arp.c
==============================================================================
--- projects/arpv2_merge_1/usr.sbin/arp/arp.c	Thu Dec 11 07:43:02 2008	(r185919)
+++ projects/arpv2_merge_1/usr.sbin/arp/arp.c	Thu Dec 11 07:51:09 2008	(r185920)
@@ -370,13 +370,6 @@ set(int argc, char **argv)
 		if (addr->sin_addr.s_addr != dst->sin_addr.s_addr)	
 			break;
 		if (sdl->sdl_family == AF_LINK &&
-#if 0
-		    /*
-		     * XXX Qing - how should this be handled?
-		     *
-		     */
-		    (rtm->rtm_flags & RTF_LLINFO) &&
-#endif		    
 		    !(rtm->rtm_flags & RTF_GATEWAY) &&
 		    valid_type(sdl->sdl_type) )
 			break;
@@ -447,21 +440,10 @@ delete(char *host, int do_proxy)
 		sdl = (struct sockaddr_dl *)(SA_SIZE(addr) + (char *)addr);
 		if (addr->sin_addr.s_addr == dst->sin_addr.s_addr &&
 		    sdl->sdl_family == AF_LINK &&
-#if 0
-		    /*
-		     * XXX Qing - how should this be handled?
-		     *
-		     */
-		    (rtm->rtm_flags & RTF_LLINFO) &&
-#endif		    
 		    !(rtm->rtm_flags & RTF_GATEWAY) &&
 		    valid_type(sdl->sdl_type) )
 			break;	/* found it */
 
-		/* Qing
-		 * why not just remove the RTF_LLINFO in the above
-		 * code instead of another "if", works 
-		 */
 		if (sdl->sdl_family == AF_LINK &&
 		    !(rtm->rtm_flags & RTF_GATEWAY) &&
 		    valid_type(sdl->sdl_type) ) {