diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2005-05-24 02:45:19 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2005-05-24 02:45:19 +0000 |
| commit | ebfdc55d0bccbe344e8950b89a5a0730ccc9253b (patch) | |
| tree | 0d112ec2b177d5ac16483cb270c2af3be371991e /sys/conf | |
| parent | c31238d30ac7cb511a14c4a4bc25106b4f89d822 (diff) | |
initial import of a trunking (link aggregation and link failover)
implementation. it currently supports round robin mode with link state
checking, additional modes will be added later.
ok brad@, deraadt@
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/conf/files | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 01128e4d312..3685dc085e8 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.115 2005/05/22 21:15:18 pedro Exp $ +# $OpenBSD: GENERIC,v 1.116 2005/05/24 02:45:17 reyk Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -103,6 +103,7 @@ pseudo-device ppp # PPP pseudo-device sl # CSLIP pseudo-device tun # network tunneling over tty pseudo-device vlan # IEEE 802.1Q VLAN +pseudo-device trunk # Trunking support # for IPv6 #pseudo-device faith 1 # IPv[46] tcp relay translation i/f diff --git a/sys/conf/files b/sys/conf/files index 1f85465e988..837718eaf15 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.337 2005/05/15 11:29:12 miod Exp $ +# $OpenBSD: files,v 1.338 2005/05/24 02:45:17 reyk Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -416,6 +416,7 @@ pseudo-device faith: ifnet pseudo-device gif: ifnet pseudo-device gre: ifnet pseudo-device crypto: ifnet +pseudo-device trunk: ifnet, ether pseudo-device sequencer pseudo-device systrace @@ -728,6 +729,7 @@ file net/rtsock.c file net/slcompress.c sl | ppp | strip file net/if_enc.c enc needs-count file net/if_gre.c gre needs-count +file net/if_trunk.c trunk needs-count file net80211/ieee80211.c wlan file net80211/ieee80211_compat.c wlan file net80211/ieee80211_crypto.c wlan |