Module Name: src
Committed By: sevan
Date: Fri Aug 10 17:54:46 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
Log Message:
Add snippet for bpfjit(4) as both i386 and amd64 are listed as supported.
Ideally BPFJIT should be enabled by default for use with NPF but I haven't
raised the question (no access to email at the moment) hence both are disabled.
To generate a diff of this commit:
cvs rdiff -u -r1.499 -r1.500 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1185 -r1.1186 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.499 src/sys/arch/amd64/conf/GENERIC:1.500
--- src/sys/arch/amd64/conf/GENERIC:1.499 Fri Aug 3 04:35:20 2018
+++ src/sys/arch/amd64/conf/GENERIC Fri Aug 10 17:54:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.499 2018/08/03 04:35:20 kamil Exp $
+# $NetBSD: GENERIC,v 1.500 2018/08/10 17:54:46 sevan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.499 $"
+#ident "GENERIC-$Revision: 1.500 $"
maxusers 64 # estimated number of users
@@ -205,6 +205,10 @@ options PPP_FILTER # Active filter supp
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
#options TCP_SIGNATURE # Enable RFC-2385 TCP md5 signatures
+# JIT compiler for bpfilter
+#options SLJIT
+#options BPFJIT
+
#options ALTQ # Manipulate network interfaces' output queues
#options ALTQ_BLUE # Stochastic Fair Blue
#options ALTQ_CBQ # Class-Based Queueing
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1185 src/sys/arch/i386/conf/GENERIC:1.1186
--- src/sys/arch/i386/conf/GENERIC:1.1185 Wed Aug 1 16:59:09 2018
+++ src/sys/arch/i386/conf/GENERIC Fri Aug 10 17:54:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1185 2018/08/01 16:59:09 maxv Exp $
+# $NetBSD: GENERIC,v 1.1186 2018/08/10 17:54:46 sevan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1185 $"
+#ident "GENERIC-$Revision: 1.1186 $"
maxusers 64 # estimated number of users
@@ -196,6 +196,10 @@ options NETATALK # AppleTalk networking
options PPP_FILTER # Active filter support for PPP (requires bpf)
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
+# JIT compiler for bpfilter
+#options SLJIT
+#options BPFJIT
+
#options ALTQ # Manipulate network interfaces' output queues
#options ALTQ_BLUE # Stochastic Fair Blue
#options ALTQ_CBQ # Class-Based Queueing