svn commit: r210859 - projects/sv/sys/net

[Attilio Rao]

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__)