Module Name: src
Committed By: ozaki-r
Date: Fri Jul 25 04:09:58 UTC 2014
Modified Files:
src/sys/dist/pf/net: pf.c
Log Message:
Unbreak the build of pf
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/dist/pf/net/pf.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/dist/pf/net/pf.c
diff -u src/sys/dist/pf/net/pf.c:1.71 src/sys/dist/pf/net/pf.c:1.72
--- src/sys/dist/pf/net/pf.c:1.71 Thu Jun 5 23:48:16 2014
+++ src/sys/dist/pf/net/pf.c Fri Jul 25 04:09:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pf.c,v 1.71 2014/06/05 23:48:16 rmind Exp $ */
+/* $NetBSD: pf.c,v 1.72 2014/07/25 04:09:58 ozaki-r Exp $ */
/* $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.71 2014/06/05 23:48:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.72 2014/07/25 04:09:58 ozaki-r Exp $");
#include "pflog.h"
@@ -5963,6 +5963,7 @@ done:
#endif /* !__NetBSD__ */
if (log) {
+#if NPFLOG > 0
struct pf_rule *lr;
if (s != NULL && s->nat_rule.ptr != NULL &&
@@ -5972,6 +5973,7 @@ done:
lr = r;
PFLOG_PACKET(kif, h, m, AF_INET, dir, reason, lr, a, ruleset,
&pd);
+#endif
}
kif->pfik_bytes[0][dir == PF_OUT][action != PF_PASS] += pd.tot_len;
@@ -6383,6 +6385,7 @@ done:
#endif /* !__NetBSD__ */
if (log) {
+#if NPFLOG > 0
struct pf_rule *lr;
if (s != NULL && s->nat_rule.ptr != NULL &&
@@ -6392,6 +6395,7 @@ done:
lr = r;
PFLOG_PACKET(kif, h, m, AF_INET6, dir, reason, lr, a, ruleset,
&pd);
+#endif
}
kif->pfik_bytes[1][dir == PF_OUT][action != PF_PASS] += pd.tot_len;
