Module Name: src
Committed By: roy
Date: Thu Sep 15 18:17:30 UTC 2016
Modified Files:
src/sys/netinet: if_arp.c in_var.h
Log Message:
Allow arplog to be used outside of if_arp.c
To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.224 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.81 -r1.82 src/sys/netinet/in_var.h
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.223 src/sys/netinet/if_arp.c:1.224
--- src/sys/netinet/if_arp.c:1.223 Wed Sep 7 13:01:39 2016
+++ src/sys/netinet/if_arp.c Thu Sep 15 18:17:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.223 2016/09/07 13:01:39 roy Exp $ */
+/* $NetBSD: if_arp.c,v 1.224 2016/09/15 18:17:29 roy 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.223 2016/09/07 13:01:39 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.224 2016/09/15 18:17:29 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -149,12 +149,10 @@ static int arp_maxhold = 1; /* number of
int ip_dad_count = PROBE_NUM;
#ifdef ARP_DEBUG
-static int arp_debug = 1;
+int arp_debug = 1;
#else
-static int arp_debug = 0;
+int arp_debug = 0;
#endif
-#define arplog(level, fmt, args...) \
- do { if (arp_debug) log(level, "%s: " fmt, __func__, ##args);} while (0)
static void arp_init(void);
Index: src/sys/netinet/in_var.h
diff -u src/sys/netinet/in_var.h:1.81 src/sys/netinet/in_var.h:1.82
--- src/sys/netinet/in_var.h:1.81 Tue Sep 13 00:45:15 2016
+++ src/sys/netinet/in_var.h Thu Sep 15 18:17:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in_var.h,v 1.81 2016/09/13 00:45:15 christos Exp $ */
+/* $NetBSD: in_var.h,v 1.82 2016/09/15 18:17:29 roy Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -378,6 +378,9 @@ struct in_multi {
extern pktqueue_t *ip_pktq;
extern int ip_dad_count; /* Duplicate Address Detection probes */
+extern int arp_debug;
+#define arplog(level, fmt, args...) \
+ do { if (arp_debug) log(level, "%s: " fmt, __func__, ##args);} while (0)
/*
* Structure used by functions below to remember position when stepping
