Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
msaitoh 2017-12-21 06:49:26 +00:00
parent a13fe566ca
commit 9305b98e86
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/pci/ixgbe/ixgbe.c
View File

@ -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 *adapter, const struct pci_attach_args *pa)
/* 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 *adapter, const struct pci_attach_args *pa)
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);

4
sys/dev/pci/ixgbe/ixv.c
View File

@ -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 *adapter, const struct pci_attach_args *pa)
/* 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 *adapter, const struct pci_attach_args *pa)
else
aprint_normal("\n");
adapter->vector = vector;
/* Tasklets for Mailbox */
adapter->link_si = softint_establish(SOFTINT_NET |IXGBE_SOFTINFT_FLAGS,
ixv_handle_link, adapter);