[src/trunk]: src/sys/dev/pci allocating queues should be finished before esta...

[knakahara <knakahara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1c4a3b3a5212
branches:  trunk
changeset: 340969:1c4a3b3a5212
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Tue Oct 13 08:17:15 2015 +0000

description:
allocating queues should be finished before establishing interrupts.

diffstat:

 sys/dev/pci/if_wm.c |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (46 lines):

diff -r 8c5d4f142ed8 -r 1c4a3b3a5212 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Tue Oct 13 08:14:27 2015 +0000
+++ b/sys/dev/pci/if_wm.c       Tue Oct 13 08:17:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.358 2015/10/13 08:14:27 knakahara Exp $    */
+/*     $NetBSD: if_wm.c,v 1.359 2015/10/13 08:17:15 knakahara 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.358 2015/10/13 08:14:27 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.359 2015/10/13 08:17:15 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -1639,6 +1639,13 @@
                return;
        }
 
+       /* XXX Currently, Tx, Rx queue are always one. */
+       sc->sc_nrxqueues = 1;
+       sc->sc_ntxqueues = 1;
+       error = wm_alloc_txrx_queues(sc);
+       if (error)
+               return;
+
 #ifndef WM_MSI_MSIX
        /*
         * Map and establish our interrupt.
@@ -1893,13 +1900,6 @@
                    (sc->sc_flags & WM_F_PCIX) ? "PCIX" : "PCI");
        }
 
-       /* XXX Currently, Tx, Rx queue are always one. */
-       sc->sc_nrxqueues = 1;
-       sc->sc_ntxqueues = 1;
-       error = wm_alloc_txrx_queues(sc);
-       if (error)
-               return;
-
        /* clear interesting stat counters */
        CSR_READ(sc, WMREG_COLC);
        CSR_READ(sc, WMREG_RXERRC);