summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2010-01-03 20:40:54 +0000
committerbrooks <brooks@FreeBSD.org>2010-01-03 20:40:54 +0000
commit3071fcfc737ab7b0e1255bdb3f8cf5dada69d734 (patch)
tree425e9dd27fbc1a4c4c478a237213dbc253c66b79
parentb51bb2125d48b478730f59c91b300fedb4562aa7 (diff)
downloadFreeBSD-src-3071fcfc737ab7b0e1255bdb3f8cf5dada69d734.zip
FreeBSD-src-3071fcfc737ab7b0e1255bdb3f8cf5dada69d734.tar.gz
Add vlan(4) to all GENERIC kernels.
MFC after: 1 week
-rw-r--r--sys/amd64/conf/GENERIC1
-rw-r--r--sys/i386/conf/GENERIC1
-rw-r--r--sys/ia64/conf/GENERIC1
-rw-r--r--sys/pc98/conf/GENERIC1
-rw-r--r--sys/powerpc/conf/GENERIC1
-rw-r--r--sys/sparc64/conf/GENERIC1
-rw-r--r--sys/sun4v/conf/GENERIC1
7 files changed, 7 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index fe477e2..0a75547 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -274,6 +274,7 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
+device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 5dbfd6f..6403634 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -287,6 +287,7 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
+device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index f925007..59d1a85 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -149,6 +149,7 @@ device sbp # SCSI over FireWire (need scbus & da)
# Various (pseudo) devices
device ether # Ethernet support
+device vlan # 802.1Q VLAN support
device faith # IPv6-to-IPv4 relaying (translation)
device gif # IPv6 and IPv4 tunneling
device loop # Network loopback
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 10caef4..858a43cb 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -241,6 +241,7 @@ device xe # Xircom pccard Ethernet
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
+device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 9e473f0..e34d805 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -131,6 +131,7 @@ device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
+device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 33e7838..a2953d1 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -216,6 +216,7 @@ device ath_rate_sample # SampleRate tx rate control for ath
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
+device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
diff --git a/sys/sun4v/conf/GENERIC b/sys/sun4v/conf/GENERIC
index ea72139..e0e2cc2 100644
--- a/sys/sun4v/conf/GENERIC
+++ b/sys/sun4v/conf/GENERIC
@@ -169,6 +169,7 @@ device bge # Broadcom BCM570xx Gigabit Ethernet
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
+device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
device pty # BSD-style compatibility pseudo ttys
device md # Memory "disks"
OpenPOWER on IntegriCloud