summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2008-10-28 22:45:21 +0000
committerBrad Smith <brad@cvs.openbsd.org>2008-10-28 22:45:21 +0000
commit8bd1d4309863e16750d511a2b2861f54f17545f6 (patch)
tree8d6270755ff78721d28225046968f4a96f229378
parentd84bc23f4a0421887e27f9529c4f81f5aa8aae39 (diff)
#if NVLAN > 0 in one more spot.
-rw-r--r--sys/dev/pci/if_nge.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index 4957f9ece16..fe5baf17164 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.64 2008/10/28 07:01:56 brad Exp $ */
+/* $OpenBSD: if_nge.c,v 1.65 2008/10/28 22:45:20 brad Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -1272,7 +1272,7 @@ nge_rxeof(sc)
ifp = &sc->arpcom.ac_if;
i = sc->nge_cdata.nge_rx_prod;
- while(NGE_OWNDESC(&sc->nge_ldata->nge_rx_list[i])) {
+ while (NGE_OWNDESC(&sc->nge_ldata->nge_rx_list[i])) {
struct mbuf *m0 = NULL;
u_int32_t extsts;
@@ -1344,11 +1344,13 @@ nge_rxeof(sc)
ifp->if_ipackets++;
+#if NVLAN > 0
if (extsts & NGE_RXEXTSTS_VLANPKT) {
m->m_pkthdr.ether_vtag =
ntohs(extsts & NGE_RXEXTSTS_VTCI);
m->m_flags |= M_VLANTAG;
}
+#endif
#if NBPFILTER > 0
/*