Merge "Ensure netlink messages come from the kernel."
diff --git a/debug.h b/debug.h
index ba4971b..8e09672 100644
--- a/debug.h
+++ b/debug.h
@@ -18,7 +18,7 @@
 #ifndef __DEBUG_H__
 #define __DEBUG_H__
 
-// set to 1 to enable debug logging
+// set to 1 to enable debug logging and packet dumping.
 #define CLAT_DEBUG 0
 
 #endif /* __DEBUG_H__ */
diff --git a/dump.c b/dump.c
index 3e4a6cc..e538f3e 100644
--- a/dump.c
+++ b/dump.c
@@ -28,10 +28,13 @@
 #include <netinet/icmp6.h>
 #include <linux/icmp.h>
 
+#include "debug.h"
 #include "checksum.h"
 #include "clatd.h"
 #include "logging.h"
 
+#if CLAT_DEBUG
+
 /* print ip header */
 void dump_ip(struct iphdr *header) {
   u_int16_t frag_flags;
@@ -223,3 +226,5 @@
 
   logmsg(ANDROID_LOG_WARN,"info %s len %d data %s", info, len, output);
 }
+
+#endif  // CLAT_DEBUG