diff options
| author | pfg <pfg@FreeBSD.org> | 2017-01-23 01:21:39 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2017-01-23 01:21:39 +0000 |
| commit | edf4f428274bef424d31790d40cc3d81ebdfe0f2 (patch) | |
| tree | 533ef9eefd8ed77cd4491ff8f43d14721fb22737 /sys/conf | |
| parent | fe726b03ecb59fe45186deca9829eadc759535aa (diff) | |
| download | FreeBSD-src-edf4f428274bef424d31790d40cc3d81ebdfe0f2.zip FreeBSD-src-edf4f428274bef424d31790d40cc3d81ebdfe0f2.tar.gz | |
MFC r312443:
mppc - Finish pluging NETGRAPH_MPPC_COMPRESSION.
There were several places where reference to compression were left
unfinished. Furthermore, KASSERTs contained references to MPPC_INVALID
which is not defined in the tree and therefore were sure to break with
INVARIANTS: comment them out.
Reported by: Eugene Grosbein
PR: 216265
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/NOTES | 3 | ||||
| -rw-r--r-- | sys/conf/options | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a0b5a5a..e5ab44a 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -747,8 +747,7 @@ options NETGRAPH_IPFW options NETGRAPH_KSOCKET options NETGRAPH_L2TP options NETGRAPH_LMI -# MPPC compression requires proprietary files (not included) -#options NETGRAPH_MPPC_COMPRESSION +options NETGRAPH_MPPC_COMPRESSION options NETGRAPH_MPPC_ENCRYPTION options NETGRAPH_NETFLOW options NETGRAPH_NAT diff --git a/sys/conf/options b/sys/conf/options index acd31c4..3892268 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -512,7 +512,6 @@ NETGRAPH_IPFW opt_netgraph.h NETGRAPH_KSOCKET opt_netgraph.h NETGRAPH_L2TP opt_netgraph.h NETGRAPH_LMI opt_netgraph.h -# MPPC compression requires proprietary files (not included) NETGRAPH_MPPC_COMPRESSION opt_netgraph.h NETGRAPH_MPPC_ENCRYPTION opt_netgraph.h NETGRAPH_NAT opt_netgraph.h |
