aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorBoris Popov <bp@FreeBSD.org>2000-01-23 03:35:11 +0000
committerBoris Popov <bp@FreeBSD.org>2000-01-23 03:35:11 +0000
commit5d94d71cd990d0fec132f51a7f3e7ee99d700909 (patch)
tree6560a3885e99ee9f44d3ddb6b0944db87e18cc13 /sys/conf
parent1d575e0fd368fec8929aaffe3372f47aeffb2b99 (diff)
downloadsrc-5d94d71cd990d0fec132f51a7f3e7ee99d700909.tar.gz
src-5d94d71cd990d0fec132f51a7f3e7ee99d700909.zip
Allow if_ef driver to be compiled into kernel.
Notes
Notes: svn path=/head/; revision=56424
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES8
-rw-r--r--sys/conf/files1
-rw-r--r--sys/conf/options4
3 files changed, 13 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index cfff2c10072f..0b7e6c83e14a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -446,6 +446,8 @@ device mn0 # Munich32x/Falc54 Nx64kbit/sec cards.
# IPv6 over IPv6 tunneling.
# The `faith' pseudo-device captures packets sent to it and diverts them
# to the IPv4/IPv6 translation daemon.
+# The `ef' pseudo-device provides support for multiple ethernet frame types
+# specified via ETHER_* options. See ef(4) for details.
#
# The PPP_BSDCOMP option enables support for compress(1) style entire
# packet compression, the PPP_DEFLATE is for zlib/gzip style compression.
@@ -467,6 +469,12 @@ options PPP_BSDCOMP #PPP BSD-compress support
options PPP_DEFLATE #PPP zlib/deflate/gzip support
options PPP_FILTER #enable bpf filtering (needs bpf)
+pseudo-device ef # Multiple ethernet frames support
+options ETHER_II # enable Ethernet_II frame
+options ETHER_8023 # enable Ethernet_802.3 (Novell) frame
+options ETHER_8022 # enable Ethernet_802.2 frame
+options ETHER_SNAP # enable Ethernet_802.2/SNAP frame
+
# for IPv6
pseudo-device gif 4 #IPv6 and IPv4 tunneling
pseudo-device faith 1 #for IPv6 and IPv4 translation
diff --git a/sys/conf/files b/sys/conf/files
index ec266fd2b5bf..38a45a6a494f 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -529,6 +529,7 @@ net/bsd_comp.c optional ppp_bsdcomp
net/if.c standard
net/if_atmsubr.c optional atm
net/if_disc.c optional disc
+net/if_ef.c optional ef
net/if_ethersubr.c optional ether
net/if_iso88025subr.c optional token
net/if_faith.c optional faith
diff --git a/sys/conf/options b/sys/conf/options
index 8f0b03a28085..4dff5798ee09 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -231,6 +231,10 @@ BOOTP_NFSROOT opt_bootp.h
BOOTP_NFSV3 opt_bootp.h
BOOTP_WIRED_TO opt_bootp.h
BRIDGE opt_bdg.h
+ETHER_II opt_ef.h
+ETHER_8023 opt_ef.h
+ETHER_8022 opt_ef.h
+ETHER_SNAP opt_ef.h
MROUTING opt_mrouting.h
INET opt_inet.h
INET6 opt_inet6.h