From 52f594bec874f8eae1a4ff2542678c753da02746 Mon Sep 17 00:00:00 2001 From: Henric Jungheim Date: Sun, 5 Oct 2003 21:58:43 +0000 Subject: Stop the chip from stripping VLAN headers (the driver ignores them) and tell the rest of the stack that "em" support VLAN frames. The "em" driver should now work with VLAN(4) pseudo-devs (and it should no longer be silently stripping VLAN headers when bridging). prodding by Attila Nagy ok jason@ --- sys/dev/pci/if_em.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sys') diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 0b3620b3e9e..e4dc5f7e5e7 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /*$FreeBSD: if_em.c,v 1.26 2003/06/05 17:51:37 pdeuskar Exp $*/ -/* $OpenBSD: if_em.c,v 1.11 2003/08/23 18:52:18 fgsch Exp $ */ +/* $OpenBSD: if_em.c,v 1.12 2003/10/05 21:58:42 henric Exp $ */ #include "bpfilter.h" #include "vlan.h" @@ -746,7 +746,7 @@ em_init(void *arg) return; } - em_enable_vlans(sc); + /* em_enable_vlans(sc); */ /* Prepare transmit descriptors and buffers */ if (em_setup_transmit_structures(sc)) { @@ -1692,6 +1692,9 @@ em_setup_interface(struct em_softc * sc) #endif #endif /* __FreeBSD__ */ +#ifdef __OpenBSD__ + ifp->if_capabilities |= IFCAP_VLAN_MTU; +#endif /* * Specify the media types supported by this adapter and register -- cgit v1.2.3