From owner-svn-src-all@FreeBSD.ORG  Fri Jan 16 09:01:45 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A6D60106567B;
	Fri, 16 Jan 2009 09:01:45 +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 953548FC16;
	Fri, 16 Jan 2009 09:01:45 +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 n0G91jkb001432;
	Fri, 16 Jan 2009 09:01:45 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0G91j1T001431;
	Fri, 16 Jan 2009 09:01:45 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <200901160901.n0G91j1T001431@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Fri, 16 Jan 2009 09:01:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187328 - head/sys/net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2009 09:01:46 -0000

Author: qingli
Date: Fri Jan 16 09:01:45 2009
New Revision: 187328
URL: http://svn.freebsd.org/changeset/base/187328

Log:
  The RTF_LLINFO was revived unconditionally, but within the kernel the
  check on the sysctl argument value being RTF_LLINFO is conditioned on
  the COMPAT_ROUTE_FLAGS kernel option. This mismatch caused the L2
  table retrieval failure, and the arp/ndp -an command displays empty L2
  tables.
  
  Reviewed by:   pjd

Modified:
  head/sys/net/rtsock.c

Modified: head/sys/net/rtsock.c
==============================================================================
--- head/sys/net/rtsock.c	Fri Jan 16 08:38:03 2009	(r187327)
+++ head/sys/net/rtsock.c	Fri Jan 16 09:01:45 2009	(r187328)
@@ -1448,11 +1448,7 @@ sysctl_rtsock(SYSCTL_HANDLER_ARGS)
 		 * specify an AF
 		 */
 		if (w.w_op == NET_RT_FLAGS &&
-#if defined(COMPAT_ROUTE_FLAGS)
-		    (w.w_arg & RTF_LLINFO)) {
-#else
-		    w.w_arg == 0) {
-#endif
+		    (w.w_arg == 0 || w.w_arg & RTF_LLINFO)) {
 			if (af != 0)
 				error = lltable_sysctl_dumparp(af, w.w_req);
 			else