d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update tx(4) to always enable vlan(4) support.

Browse Source 
Approved by:		semenu
This commit is contained in:
brooks 2001-09-05 23:04:53 +00:00
parent 1674546f60
commit 115d713955
5 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/man/man4/man4.i386/tx.4
View File

@ -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"

8
share/man/man4/tx.4
View File

@ -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"

6
sys/dev/tx/if_tx.c
View File

@ -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:

6
sys/modules/tx/Makefile
View File

@ -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>

6
sys/pci/if_tx.c
View File

@ -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: