Module Name:    src
Committed By:   christos
Date:           Sun Sep 18 02:17:43 UTC 2016

Modified Files:
        src/sys/netinet: if_arp.c in_var.h ip_output.c

Log Message:
Dealing with arplog is a bit more complicated...


To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.84 -r1.85 src/sys/netinet/in_var.h
cvs rdiff -u -r1.261 -r1.262 src/sys/netinet/ip_output.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.226 src/sys/netinet/if_arp.c:1.227
--- src/sys/netinet/if_arp.c:1.226	Fri Sep 16 09:47:47 2016
+++ src/sys/netinet/if_arp.c	Sat Sep 17 22:17:43 2016
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1
 
 #ifdef INET
 
+#include "arp.h"
 #include "bridge.h"
 
 #include <sys/param.h>

Index: src/sys/netinet/in_var.h
diff -u src/sys/netinet/in_var.h:1.84 src/sys/netinet/in_var.h:1.85
--- src/sys/netinet/in_var.h:1.84	Fri Sep 16 22:37:59 2016
+++ src/sys/netinet/in_var.h	Sat Sep 17 22:17:43 2016
@@ -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 @@ struct in_multi {
 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)

Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.261 src/sys/netinet/ip_output.c:1.262
--- src/sys/netinet/ip_output.c:1.261	Thu Sep 15 14:25:45 2016
+++ src/sys/netinet/ip_output.c	Sat Sep 17 22:17:43 2016
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: ip_output.c,
 #include "opt_mpls.h"
 #endif
 
+#include "arp.h"
+
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>

Reply via email to