diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2008-10-19 23:16:39 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2008-10-19 23:16:39 +0000 |
| commit | f0983c6676a35031d36ef887f2e9d6f07e1fc914 (patch) | |
| tree | 86785a77c8212af6658138ebc84d4f2489db7d78 /sys/dev/pci/if_bnx.c | |
| parent | c2e9a02b4ab0f36c0ecb7ec2b24817f1f1a1e6b9 (diff) | |
Re-add support for RX VLAN tag stripping.
Diffstat (limited to 'sys/dev/pci/if_bnx.c')
| -rw-r--r-- | sys/dev/pci/if_bnx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c index 405b1e660d2..e3237974cfa 100644 --- a/sys/dev/pci/if_bnx.c +++ b/sys/dev/pci/if_bnx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnx.c,v 1.68 2008/10/16 19:18:03 naddy Exp $ */ +/* $OpenBSD: if_bnx.c,v 1.69 2008/10/19 23:16:38 brad Exp $ */ /*- * Copyright (c) 2006 Broadcom Corporation @@ -4836,7 +4836,8 @@ bnx_set_rx_mode(struct bnx_softc *sc) * ASF/IPMI/UMP firmware requires that VLAN tag stripping * be enbled. */ - if (!(sc->bnx_flags & BNX_MFW_ENABLE_FLAG)) + if (!(ifp->if_capabilities & IFCAP_VLAN_HWTAGGING) && + (!(sc->bnx_flags & BNX_MFW_ENABLE_FLAG))) rx_mode |= BNX_EMAC_RX_MODE_KEEP_VLAN_TAG; /* |