Module Name: src
Committed By: msaitoh
Date: Mon Nov 14 05:38:39 UTC 2016
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Set CTRL_MEHE correctly (PCH_{LPT,SPT} only).
To generate a diff of this commit:
cvs rdiff -u -r1.443 -r1.444 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.443 src/sys/dev/pci/if_wm.c:1.444
--- src/sys/dev/pci/if_wm.c:1.443 Thu Nov 10 08:35:24 2016
+++ src/sys/dev/pci/if_wm.c Mon Nov 14 05:38:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.443 2016/11/10 08:35:24 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.444 2016/11/14 05:38:39 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.443 2016/11/10 08:35:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.444 2016/11/14 05:38:39 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -5200,9 +5200,8 @@ wm_init_locked(struct ifnet *ifp)
reg |= PBECCSTS_UNCORR_ECC_ENABLE;
CSR_WRITE(sc, WMREG_PBECCSTS, reg);
- reg = CSR_READ(sc, WMREG_CTRL);
- reg |= CTRL_MEHE;
- CSR_WRITE(sc, WMREG_CTRL, reg);
+ sc->sc_ctrl |= CTRL_MEHE;
+ CSR_WRITE(sc, WMREG_CTRL, sc->sc_ctrl);
break;
default:
break;
