Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Call wm_get_wakeup(sc) before checking WM_F_HAS_...



details:   https://anonhg.NetBSD.org/src/rev/3c78b3fa67ba
branches:  trunk
changeset: 811451:3c78b3fa67ba
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Oct 30 18:29:08 2015 +0000

description:
Call wm_get_wakeup(sc) before checking WM_F_HAS_AMT.

diffstat:

 sys/dev/pci/if_wm.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 240839d062f0 -r 3c78b3fa67ba sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Oct 30 18:25:49 2015 +0000
+++ b/sys/dev/pci/if_wm.c       Fri Oct 30 18:29:08 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.378 2015/10/30 18:23:37 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.379 2015/10/30 18:29:08 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.378 2015/10/30 18:23:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.379 2015/10/30 18:29:08 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -2017,6 +2017,7 @@
        if ((sc->sc_flags & WM_F_PLL_WA_I210) != 0)
                wm_pll_workaround_i210(sc);
 
+       wm_get_wakeup(sc);
        switch (sc->sc_type) {
        case WM_T_82571:
        case WM_T_82572:
@@ -2037,7 +2038,7 @@
        default:
                break;
        }
-       wm_get_wakeup(sc);
+
        /*
         * Read the Ethernet address from the EEPROM, if not first found
         * in device properties.



Home | Main Index | Thread Index | Old Index