diff options
author | Brad Smith <brad@cvs.openbsd.org> | 2005-04-23 22:59:02 +0000 |
---|---|---|
committer | Brad Smith <brad@cvs.openbsd.org> | 2005-04-23 22:59:02 +0000 |
commit | fcfdb621e2a275b1dc497f8a4a15b2004cda1018 (patch) | |
tree | 4c9c01fbd82a2494ed0808281cbe6476248fae7d /sys | |
parent | 6d760f36642c9671932ee277fcc37b66f317822a (diff) |
accept VLAN-sized frames
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/pci/if_bce.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c index 37dba592966..4a957516283 100644 --- a/sys/dev/pci/if_bce.c +++ b/sys/dev/pci/if_bce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bce.c,v 1.5 2005/01/04 02:32:18 brad Exp $ */ +/* $OpenBSD: if_bce.c,v 1.6 2005/04/23 22:59:01 brad Exp $ */ /* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $ */ /* @@ -36,7 +36,6 @@ */ #include "bpfilter.h" -#include "vlan.h" #include <sys/param.h> #include <sys/systm.h> @@ -409,6 +408,8 @@ bce_attach(parent, self, aux) ifp->if_init = bce_init; IFQ_SET_READY(&ifp->if_snd); + ifp->if_capabilities = IFCAP_VLAN_MTU; + /* MAC address */ sc->bce_ac.ac_enaddr[0] = bus_space_read_1(sc->bce_btag, sc->bce_bhandle, BCE_MAGIC_ENET0); @@ -971,11 +972,11 @@ bce_init(ifp) /* setup packet filter */ bce_set_filter(ifp); - /* set max frame length, account for possible vlan tag */ + /* set max frame length, account for possible VLAN tag */ bus_space_write_4(sc->bce_btag, sc->bce_bhandle, BCE_RX_MAX, - ETHER_MAX_LEN + 32); + ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN); bus_space_write_4(sc->bce_btag, sc->bce_bhandle, BCE_TX_MAX, - ETHER_MAX_LEN + 32); + ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN); /* set tx watermark */ bus_space_write_4(sc->bce_btag, sc->bce_bhandle, BCE_TX_WATER, 56); |