diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2006-02-16 17:35:52 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2006-02-16 17:35:52 +0000 |
| commit | f58e8905010225058178f5ce055fcd580751dc18 (patch) | |
| tree | d22b7fb3627df4841c042d464f33b24dbd0fdb53 /sys/dev/pci/if_nfereg.h | |
| parent | ff18dafa045c6fa286018a40158122c68f840dbe (diff) | |
- stop enabling/disabling interrupts in nfe_intr().
- store RX/TX settings in nfe_softc so we don't recompute them all the time.
- fix h/w VLAN tagging flags.
Diffstat (limited to 'sys/dev/pci/if_nfereg.h')
| -rw-r--r-- | sys/dev/pci/if_nfereg.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/if_nfereg.h b/sys/dev/pci/if_nfereg.h index 614aa8a4c12..34b2d7b3054 100644 --- a/sys/dev/pci/if_nfereg.h +++ b/sys/dev/pci/if_nfereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfereg.h,v 1.12 2006/02/15 20:08:59 damien Exp $ */ +/* $OpenBSD: if_nfereg.h,v 1.13 2006/02/16 17:35:51 damien Exp $ */ /*- * Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org> @@ -100,7 +100,7 @@ #define NFE_RXTX_RESET 0x0010 #define NFE_RXTX_VTAG_STRIP 0x0040 #define NFE_RXTX_VTAG_INSERT 0x0080 -#define NFE_RXTX_RXCHECK 0x0400 +#define NFE_RXTX_RXCSUM 0x0400 #define NFE_RXTX_V2MAGIC 0x2100 #define NFE_RXTX_V3MAGIC 0x2200 #define NFE_RXFILTER_MAGIC 0x007f0008 @@ -145,13 +145,13 @@ struct nfe_desc32 { struct nfe_desc64 { uint32_t physaddr[2]; uint32_t vtag; +#define NFE_RX_VTAG (1 << 16) +#define NFE_TX_VTAG (1 << 18) uint16_t length; uint16_t flags; #define NFE_RX_FIXME_V2 0x4300 -#define NFE_RX_VTAG (1 << 0) #define NFE_RX_VALID_V2 (1 << 13) #define NFE_TX_ERROR_V2 0x5c04 -#define NFE_TX_VTAG (1 << 2) #define NFE_TX_LASTFRAG_V2 (1 << 13) } __packed; |