[src/trunk]: src/sys/dev/pci/ixgbe Fix panic when only link interrupt can't b...

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

details:   https://anonhg.NetBSD.org/src/rev/d040ad64955d
branches:  trunk
changeset: 358304:d040ad64955d
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Dec 21 06:49:26 2017 +0000

description:
Fix panic when only link interrupt can't be established.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  4 ++--
 sys/dev/pci/ixgbe/ixv.c   |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r fbdc9a117d7d -r d040ad64955d sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Thu Dec 21 06:43:17 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Thu Dec 21 06:49:26 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.116 2017/12/20 08:51:42 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.117 2017/12/21 06:49:26 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -5886,6 +5886,7 @@
        /* and Link */
        cpu_id++;
        snprintf(intr_xname, sizeof(intr_xname), "%s link", device_xname(dev));
+       adapter->vector = vector;
        intrstr = pci_intr_string(pc, adapter->osdep.intrs[vector], intrbuf,
            sizeof(intrbuf));
 #ifdef IXGBE_MPSAFE
@@ -5914,7 +5915,6 @@
        else
                aprint_normal("\n");
 
-       adapter->vector = vector;
        /* Tasklets for Link, SFP and Multispeed Fiber */
        adapter->link_si = softint_establish(SOFTINT_NET |IXGBE_SOFTINFT_FLAGS,
            ixgbe_handle_link, adapter);
diff -r fbdc9a117d7d -r d040ad64955d sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Thu Dec 21 06:43:17 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Thu Dec 21 06:49:26 2017 +0000
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.76 2017/12/21 06:43:17 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.77 2017/12/21 06:49:26 msaitoh Exp $*/
 
 /******************************************************************************
 
@@ -2696,6 +2696,7 @@
        /* and Mailbox */
        cpu_id++;
        snprintf(intr_xname, sizeof(intr_xname), "%s link", device_xname(dev));
+       adapter->vector = vector;
        intrstr = pci_intr_string(pc, adapter->osdep.intrs[vector], intrbuf,
            sizeof(intrbuf));
 #ifdef IXGBE_MPSAFE
@@ -2724,7 +2725,6 @@
        else
                aprint_normal("\n");
 
-       adapter->vector = vector;
        /* Tasklets for Mailbox */
        adapter->link_si = softint_establish(SOFTINT_NET |IXGBE_SOFTINFT_FLAGS,
            ixv_handle_link, adapter);