Module Name: src
Committed By: msaitoh
Date: Thu Dec 21 06:49:26 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c
Log Message:
Fix panic when only link interrupt can't be established.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.116 src/sys/dev/pci/ixgbe/ixgbe.c:1.117
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.116 Wed Dec 20 08:51:42 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Dec 21 06:49:26 2017
@@ -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 @@ ixgbe_allocate_msix(struct adapter *adap
/* 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 @@ ixgbe_allocate_msix(struct adapter *adap
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);
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.76 src/sys/dev/pci/ixgbe/ixv.c:1.77
--- src/sys/dev/pci/ixgbe/ixv.c:1.76 Thu Dec 21 06:43:17 2017
+++ src/sys/dev/pci/ixgbe/ixv.c Thu Dec 21 06:49:26 2017
@@ -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 @@ ixv_allocate_msix(struct adapter *adapte
/* 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 @@ ixv_allocate_msix(struct adapter *adapte
else
aprint_normal("\n");
- adapter->vector = vector;
/* Tasklets for Mailbox */
adapter->link_si = softint_establish(SOFTINT_NET |IXGBE_SOFTINFT_FLAGS,
ixv_handle_link, adapter);
