diff options
| author | brooks <brooks@FreeBSD.org> | 2001-09-05 23:04:53 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2001-09-05 23:04:53 +0000 |
| commit | 115d713955fd41bd107c98cecd057dbe1544b141 (patch) | |
| tree | 2ad3d0064c167d8549305e65563a5cf1d7cd7d8e | |
| parent | 1674546f604e4018977588bf67c4e633cc07346d (diff) | |
| download | FreeBSD-src-115d713955fd41bd107c98cecd057dbe1544b141.zip FreeBSD-src-115d713955fd41bd107c98cecd057dbe1544b141.tar.gz | |
Update tx(4) to always enable vlan(4) support.
Approved by: semenu
| -rw-r--r-- | share/man/man4/man4.i386/tx.4 | 8 | ||||
| -rw-r--r-- | share/man/man4/tx.4 | 8 | ||||
| -rw-r--r-- | sys/dev/tx/if_tx.c | 6 | ||||
| -rw-r--r-- | sys/modules/tx/Makefile | 6 | ||||
| -rw-r--r-- | sys/pci/if_tx.c | 6 |
5 files changed, 1 insertions, 33 deletions
diff --git a/share/man/man4/man4.i386/tx.4 b/share/man/man4/man4.i386/tx.4 index 5704330..7796ce0 100644 --- a/share/man/man4/man4.i386/tx.4 +++ b/share/man/man4/man4.i386/tx.4 @@ -81,14 +81,6 @@ driver supports the VLAN operation (using inteface) without decreasing the MTU on the .Xr vlan 4 interfaces. -This support must be enabled by adding -.Cd "device vlan" -to the kernel configuration file (if compiling statically) or inserting -the -.Dq Li "#define NVLAN 1" -line into the -.Pa sys/modules/tx/vlan.h -(if compiling as KLD). .Sh DIAGNOSTICS .Bl -diag .It "tx%d: device timeout %d packets" diff --git a/share/man/man4/tx.4 b/share/man/man4/tx.4 index 5704330..7796ce0 100644 --- a/share/man/man4/tx.4 +++ b/share/man/man4/tx.4 @@ -81,14 +81,6 @@ driver supports the VLAN operation (using inteface) without decreasing the MTU on the .Xr vlan 4 interfaces. -This support must be enabled by adding -.Cd "device vlan" -to the kernel configuration file (if compiling statically) or inserting -the -.Dq Li "#define NVLAN 1" -line into the -.Pa sys/modules/tx/vlan.h -(if compiling as KLD). .Sh DIAGNOSTICS .Bl -diag .It "tx%d: device timeout %d packets" diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index 707355d..0fb9051 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -54,8 +54,6 @@ #if defined(__FreeBSD__) #define NBPFILTER 1 -#include "vlan.h" - #include <net/if.h> #include <net/if_arp.h> #include <net/ethernet.h> @@ -63,9 +61,7 @@ #include <net/bpf.h> -#if NVLAN > 0 #include <net/if_vlan_var.h> -#endif #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ @@ -561,9 +557,7 @@ epic_freebsd_attach(dev) /* Attach to OS's managers */ ether_ifattach(ifp, ETHER_BPF_SUPPORTED); -#if NVLAN > 0 ifp->if_hdrlen = sizeof(struct ether_vlan_header); -#endif callout_handle_init(&sc->stat_ch); fail: diff --git a/sys/modules/tx/Makefile b/sys/modules/tx/Makefile index b9fdd6d..c1c1dfa 100644 --- a/sys/modules/tx/Makefile +++ b/sys/modules/tx/Makefile @@ -4,10 +4,6 @@ KMOD= if_tx SRCS= if_tx.c opt_bdg.h device_if.h bus_if.h pci_if.h -SRCS+= miibus_if.h vlan.h -CLEANFILES = vlan.h - -vlan.h: - touch vlan.h +SRCS+= miibus_if.h .include <bsd.kmod.mk> diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c index 707355d..0fb9051 100644 --- a/sys/pci/if_tx.c +++ b/sys/pci/if_tx.c @@ -54,8 +54,6 @@ #if defined(__FreeBSD__) #define NBPFILTER 1 -#include "vlan.h" - #include <net/if.h> #include <net/if_arp.h> #include <net/ethernet.h> @@ -63,9 +61,7 @@ #include <net/bpf.h> -#if NVLAN > 0 #include <net/if_vlan_var.h> -#endif #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ @@ -561,9 +557,7 @@ epic_freebsd_attach(dev) /* Attach to OS's managers */ ether_ifattach(ifp, ETHER_BPF_SUPPORTED); -#if NVLAN > 0 ifp->if_hdrlen = sizeof(struct ether_vlan_header); -#endif callout_handle_init(&sc->stat_ch); fail: |
