[src/trunk]: src/sys/netinet Dealing with arplog is a bit more complicated...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/239e9f022b99
branches:  trunk
changeset: 817982:239e9f022b99
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Sep 18 02:17:43 2016 +0000

description:
Dealing with arplog is a bit more complicated...

diffstat:

 sys/netinet/if_arp.c    |  5 +++--
 sys/netinet/in_var.h    |  4 ++--
 sys/netinet/ip_output.c |  6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diffs (71 lines):

diff -r 5e207d622bb4 -r 239e9f022b99 sys/netinet/if_arp.c
--- a/sys/netinet/if_arp.c      Sun Sep 18 02:07:07 2016 +0000
+++ b/sys/netinet/if_arp.c      Sun Sep 18 02:17:43 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_arp.c,v 1.226 2016/09/16 13:47:47 roy Exp $ */
+/*     $NetBSD: if_arp.c,v 1.227 2016/09/18 02:17:43 christos Exp $    */
 
 /*-
  * Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.226 2016/09/16 13:47:47 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.227 2016/09/18 02:17:43 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -77,6 +77,7 @@
 
 #ifdef INET
 
+#include "arp.h"
 #include "bridge.h"
 
 #include <sys/param.h>
diff -r 5e207d622bb4 -r 239e9f022b99 sys/netinet/in_var.h
--- a/sys/netinet/in_var.h      Sun Sep 18 02:07:07 2016 +0000
+++ b/sys/netinet/in_var.h      Sun Sep 18 02:17:43 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_var.h,v 1.84 2016/09/17 02:37:59 christos Exp $     */
+/*     $NetBSD: in_var.h,v 1.85 2016/09/18 02:17:43 christos Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -378,7 +378,7 @@
 extern pktqueue_t *ip_pktq;
 
 extern int ip_dad_count;               /* Duplicate Address Detection probes */
-#ifdef INET
+#if defined(INET) && NARP > 0
 extern int arp_debug;
 #define arplog(level, fmt, args...) \
        do { if (arp_debug) log(level, "%s: " fmt, __func__, ##args);} while (0)
diff -r 5e207d622bb4 -r 239e9f022b99 sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c   Sun Sep 18 02:07:07 2016 +0000
+++ b/sys/netinet/ip_output.c   Sun Sep 18 02:17:43 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_output.c,v 1.261 2016/09/15 18:25:45 roy Exp $      */
+/*     $NetBSD: ip_output.c,v 1.262 2016/09/18 02:17:43 christos Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.261 2016/09/15 18:25:45 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.262 2016/09/18 02:17:43 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -101,6 +101,8 @@
 #include "opt_mpls.h"
 #endif
 
+#include "arp.h"
+
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>