From 1de9ec346e6548f74a6e728ec6987d1806d96a64 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Tue, 28 Oct 2008 05:53:21 +0000 Subject: Remove #if NVLAN. --- sys/dev/pci/if_nfe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index 5e5bd195a25..6a3234b0797 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfe.c,v 1.84 2008/10/28 05:09:43 brad Exp $ */ +/* $OpenBSD: if_nfe.c,v 1.85 2008/10/28 05:53:20 brad Exp $ */ /*- * Copyright (c) 2006, 2007 Damien Bergamini @@ -1106,10 +1106,10 @@ nfe_init(struct ifnet *ifp) DELAY(10); NFE_WRITE(sc, NFE_RXTX_CTL, sc->rxtxctl); -#if NVLAN - if (sc->sc_flags & NFE_HW_VLAN) + if (ifp->if_capabilities & IFCAP_VLAN_HWTAGGING) NFE_WRITE(sc, NFE_VTAG_CTL, NFE_VTAG_ENABLE); -#endif + else + NFE_WRITE(sc, NFE_VTAG_CTL, 0); NFE_WRITE(sc, NFE_SETUP_R6, 0); -- cgit v1.2.3