From owner-svn-src-projects@FreeBSD.ORG  Thu Aug  5 11:28:03 2010
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 6AAAE106567A;
	Thu,  5 Aug 2010 11:28:03 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 593E88FC25;
	Thu,  5 Aug 2010 11:28:03 +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 o75BS3kT075881;
	Thu, 5 Aug 2010 11:28:03 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o75BS3jH075879;
	Thu, 5 Aug 2010 11:28:03 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201008051128.o75BS3jH075879@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Thu, 5 Aug 2010 11:28:03 +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: r210859 - projects/sv/sys/net
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, 05 Aug 2010 11:28:03 -0000

Author: attilio
Date: Thu Aug  5 11:28:03 2010
New Revision: 210859
URL: http://svn.freebsd.org/changeset/base/210859

Log:
  - Sort appropriately the opt headers
  - Remove the HAVE_KERNEL_OPTION_HEADERS because netdump_client is still
    not loaded as module (it can be reintroduced in the future eventually)
  - Wrap ddb.h around DDB
  - Appropriately include netdump.h

Modified:
  projects/sv/sys/net/netdump_client.c

Modified: projects/sv/sys/net/netdump_client.c
==============================================================================
--- projects/sv/sys/net/netdump_client.c	Thu Aug  5 11:15:52 2010	(r210858)
+++ projects/sv/sys/net/netdump_client.c	Thu Aug  5 11:28:03 2010	(r210859)
@@ -32,9 +32,9 @@
  *
 */
 
-#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_ddb.h"
 #include "opt_device_polling.h"
-#endif
+#include "opt_netdump.h"
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -75,13 +75,12 @@
 #include <machine/_inttypes.h>
 #include <net/if_media.h>
 #include <net/if_mib.h>
+#include <net/netdump.h>
 #include <machine/clock.h>
 
+#ifdef DDB
 #include <ddb/ddb.h>
-
-#include <netinet/netdump.h>
-#include "opt_netdump.h"
-#include "opt_ddb.h"
+#endif
 
 #ifdef NETDUMP_DEBUG
 #define	NETDDEBUG(f, ...)		printf((f), ## __VA_ARGS__)