Module Name: src
Committed By: msaitoh
Date: Thu Mar 10 03:58:52 UTC 2022
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Move the definition of eicr_mask variable. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.309 -r1.310 src/sys/dev/pci/ixgbe/ixgbe.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.309 src/sys/dev/pci/ixgbe/ixgbe.c:1.310
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.309 Thu Mar 10 03:57:33 2022
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Mar 10 03:58:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.309 2022/03/10 03:57:33 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.310 2022/03/10 03:58:52 msaitoh Exp $ */
/******************************************************************************
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.309 2022/03/10 03:57:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.310 2022/03/10 03:58:52 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3179,7 +3179,6 @@ static void
ixgbe_intr_admin_common(struct adapter *adapter, u32 eicr, u32 *eims_disable)
{
struct ixgbe_hw *hw = &adapter->hw;
- u32 eicr_mask;
u32 task_requests = 0;
s32 retval;
@@ -3190,6 +3189,8 @@ ixgbe_intr_admin_common(struct adapter *
}
if (ixgbe_is_sfp(hw)) {
+ u32 eicr_mask;
+
/* Pluggable optics-related interrupt */
if (hw->mac.type >= ixgbe_mac_X540)
eicr_mask = IXGBE_EICR_GPI_SDP0_X540;
