summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-11-15 02:24:38 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-11-15 02:24:38 +0000
commitf672ef1a7d1d652f6c7be5995c9de9ab1a14ebd8 (patch)
treed5bfe45785e774c4a0804ef35bd44dabf9842ed8 /sys/dev
parentf514fa3a7b597fcbf353f304e14669d1f7a4437c (diff)
Correct the WOL magic value and rename NFE_WOL_MAGIC to NFE_WOL_ENABLE.
WOL magic value from Peer Chen@NVIDIA via FreeBSD. ok jsg@ damien@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_nfe.c4
-rw-r--r--sys/dev/pci/if_nfereg.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 5baa9d72fd1..14d4aeb6eb6 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.66 2006/11/10 20:46:58 damien Exp $ */
+/* $OpenBSD: if_nfe.c,v 1.67 2006/11/15 02:24:37 brad Exp $ */
/*-
* Copyright (c) 2006 Damien Bergamini <damien.bergamini@free.fr>
@@ -1127,7 +1127,7 @@ nfe_init(struct ifnet *ifp)
NFE_WRITE(sc, NFE_STATUS, sc->mii_phyaddr << 24 | NFE_STATUS_MAGIC);
NFE_WRITE(sc, NFE_SETUP_R4, NFE_R4_MAGIC);
- NFE_WRITE(sc, NFE_WOL_CTL, NFE_WOL_MAGIC);
+ NFE_WRITE(sc, NFE_WOL_CTL, NFE_WOL_ENABLE);
sc->rxtxctl &= ~NFE_RXTX_BIT2;
NFE_WRITE(sc, NFE_RXTX_CTL, sc->rxtxctl);
diff --git a/sys/dev/pci/if_nfereg.h b/sys/dev/pci/if_nfereg.h
index c7846ea9249..1af8a110d8b 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.19 2006/05/28 00:20:21 brad Exp $ */
+/* $OpenBSD: if_nfereg.h,v 1.20 2006/11/15 02:24:37 brad Exp $ */
/*-
* Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org>
@@ -86,7 +86,7 @@
#define NFE_R2_MAGIC 0x16
#define NFE_R4_MAGIC 0x08
#define NFE_R6_MAGIC 0x03
-#define NFE_WOL_MAGIC 0x7770
+#define NFE_WOL_ENABLE 0x1111
#define NFE_RX_START 0x01
#define NFE_TX_START 0x01