summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_nfereg.h
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2006-02-19 13:57:03 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2006-02-19 13:57:03 +0000
commitc57613916c99167d471437d8ee2d203b379e27f7 (patch)
treeb4df188efd051ff233b888ffbc86958e1860140c /sys/dev/pci/if_nfereg.h
parentfea00aaf4e0597397b523b56ac02b207af9cd329 (diff)
- fix h/w VLAN tagging and enable it for adapters that support it (VLAN tag
stripping job is left to the network stack). - enable interrupt mitigation by default. - add some magic to the initialization sequence in the hope that it will fix TX issues seen on some adapters.
Diffstat (limited to 'sys/dev/pci/if_nfereg.h')
-rw-r--r--sys/dev/pci/if_nfereg.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/pci/if_nfereg.h b/sys/dev/pci/if_nfereg.h
index 34b2d7b3054..8ba484858da 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.13 2006/02/16 17:35:51 damien Exp $ */
+/* $OpenBSD: if_nfereg.h,v 1.14 2006/02/19 13:57:02 damien Exp $ */
/*-
* Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org>
@@ -70,15 +70,19 @@
#define NFE_PATTERN_MASK 0x208
#define NFE_PWR_CAP 0x268
#define NFE_PWR_STATE 0x26c
+#define NFE_VTAG_CTL 0x300
#define NFE_PHY_ERROR 0x00001
#define NFE_PHY_WRITE 0x00400
#define NFE_PHY_BUSY 0x08000
#define NFE_PHYADD_SHIFT 5
+#define NFE_STATUS_MAGIC 0x140000
+
#define NFE_R1_MAGIC 0x16070f
#define NFE_R2_MAGIC 0x16
#define NFE_R4_MAGIC 0x08
+#define NFE_R6_MAGIC 0x03
#define NFE_WOL_MAGIC 0x7770
#define NFE_RX_START 0x01
#define NFE_TX_START 0x01
@@ -110,6 +114,8 @@
/* default interrupt moderation timer of 128us */
#define NFE_IM_DEFAULT ((128 * 100) / 1024)
+#define NFE_VTAG_ENABLE (1 << 13)
+
#define NFE_PWR_VALID (1 << 8)
#define NFE_PWR_WAKEUP (1 << 15)