diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2008-10-28 05:04:33 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2008-10-28 05:04:33 +0000 |
| commit | efbaca61be12a1fd03213155b0a27313e54a293b (patch) | |
| tree | bd46fc84327555655d4056ba645d5b48f039caf5 /sys | |
| parent | c87e267e8f510416f8bd4ffe4b40570a327e62fe (diff) | |
Don't need NVLAN > 0 checks around this code.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_nge.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c index 7b509cec7c5..98ca3fe812e 100644 --- a/sys/dev/pci/if_nge.c +++ b/sys/dev/pci/if_nge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nge.c,v 1.62 2008/10/28 04:32:23 brad Exp $ */ +/* $OpenBSD: if_nge.c,v 1.63 2008/10/28 05:04:32 brad Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -1804,7 +1804,6 @@ nge_init(xsc) */ CSR_WRITE_4(sc, NGE_VLAN_IP_RXCTL, NGE_VIPRXCTL_IPCSUM_ENB); -#if NVLAN > 0 /* * If VLAN support is enabled, tell the chip to detect * and strip VLAN tag info from received frames. The tag @@ -1813,12 +1812,10 @@ nge_init(xsc) if (ifp->if_capabilities & IFCAP_VLAN_HWTAGGING) NGE_SETBIT(sc, NGE_VLAN_IP_RXCTL, NGE_VIPRXCTL_TAG_DETECT_ENB | NGE_VIPRXCTL_TAG_STRIP_ENB); -#endif /* Set TX configuration */ CSR_WRITE_4(sc, NGE_TX_CFG, NGE_TXCFG); -#if NVLAN > 0 /* * If VLAN support is enabled, tell the chip to insert * VLAN tags on a per-packet basis as dictated by the @@ -1826,7 +1823,6 @@ nge_init(xsc) */ if (ifp->if_capabilities & IFCAP_VLAN_HWTAGGING) NGE_SETBIT(sc, NGE_VLAN_IP_TXCTL, NGE_VIPTXCTL_TAG_PER_PKT); -#endif /* Set full/half duplex mode. */ if (sc->nge_tbi) |