diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/modules/netgraph/iface/ng_iface.8 | 2 | ||||
| -rw-r--r-- | sys/sys/param.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 0041bf87df7c..1e0bd68cc5ec 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -36,7 +36,7 @@ TYPE="FreeBSD" REVISION="3.4" -BRANCH="STABLE" +BRANCH="RELEASE" RELEASE="${REVISION}-${BRANCH}" SNAPDATE="" if [ "X${SNAPDATE}" != "X" ]; then diff --git a/sys/modules/netgraph/iface/ng_iface.8 b/sys/modules/netgraph/iface/ng_iface.8 index 376b5c5a8dd6..7cb1884c16a9 100644 --- a/sys/modules/netgraph/iface/ng_iface.8 +++ b/sys/modules/netgraph/iface/ng_iface.8 @@ -68,6 +68,7 @@ In the KLD module, only support for IP is compiled in by default. .Pp .Nm Iface nodes support the Berkeley Packet Filter (BPF). +In the KLD module, this support is disabled by default. .Sh HOOKS This node type supports the following hooks: .Pp @@ -118,7 +119,6 @@ control message disconnects all hooks but does not remove the node. .Xr netgraph 4 , .Xr bpf 4 , .Xr ng_cisco 8 , -.Xr ng_ppp 8 , .Xr ng_rfc1490 8 , .Xr ngctl 8 , .Xr ifconfig 8 . diff --git a/sys/sys/param.h b/sys/sys/param.h index 95e5d7721241..e75ec03156d9 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -46,7 +46,7 @@ #define BSD4_3 1 #define BSD4_4 1 #undef __FreeBSD_version -#define __FreeBSD_version 340001 /* Master, propagated to newvers */ +#define __FreeBSD_version 340000 /* Master, propagated to newvers */ #ifndef NULL #define NULL 0 |