Module Name: src
Committed By: msaitoh
Date: Fri Dec 21 08:29:22 UTC 2018
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix WoL detection once again.
To generate a diff of this commit:
cvs rdiff -u -r1.610 -r1.611 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.610 src/sys/dev/pci/if_wm.c:1.611
--- src/sys/dev/pci/if_wm.c:1.610 Thu Dec 20 09:32:13 2018
+++ src/sys/dev/pci/if_wm.c Fri Dec 21 08:29:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.610 2018/12/20 09:32:13 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.611 2018/12/21 08:29:22 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.610 2018/12/20 09:32:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.611 2018/12/21 08:29:22 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -2396,12 +2396,12 @@ alloc_retry:
case WM_T_PCH_CNP:
apme_mask = WUC_APME;
eeprom_data = CSR_READ(sc, WMREG_WUC);
+ if ((eeprom_data & apme_mask) != 0)
+ sc->sc_flags |= WM_F_WOL;
break;
default:
break;
}
- if ((eeprom_data & apme_mask) != 0)
- sc->sc_flags |= WM_F_WOL;
/* Reset the chip to a known state. */
wm_reset(sc);
