diff options
| author |   jsg <jsg@openbsd.org> | 2010-08-03 16:21:52 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2010-08-03 16:21:52 +0000 |
| commit | 43e67a8c7afb43faa6f4346876d7c11fff3234c6 (patch) | |
| tree | e7c348a7f7bdaa568a9c1bacc122295ac81980d4 | |
| parent | Correct use of logical and where binary and was intended. (diff) | |
| download | wireguard-openbsd-43e67a8c7afb43faa6f4346876d7c11fff3234c6.tar.xz wireguard-openbsd-43e67a8c7afb43faa6f4346876d7c11fff3234c6.zip | |
Disable hardware VLAN stripping/insertion on 8257[56] for now. While
stripping works insertion seems to have trouble in certain conditions,
which needs to be fixed before we want to enable hardware support for this.
ok deraadt@
| -rw-r--r-- | sys/dev/pci/if_em.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 5de45f7fdde..660a2711cde 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.241 2010/07/26 19:21:24 kettenis Exp $ */ +/* $OpenBSD: if_em.c,v 1.242 2010/08/03 16:21:52 jsg Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -1816,7 +1816,8 @@ em_setup_interface(struct em_softc *sc) ifp->if_capabilities = IFCAP_VLAN_MTU; #if NVLAN > 0 - ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING; + if (sc->hw.mac_type != em_82575) + ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING; #endif #ifdef EM_CSUM_OFFLOAD |