Module Name: src
Committed By: msaitoh
Date: Sat Dec 8 14:57:11 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Don't call callout_halt() if it's not initialzied.
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 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.169 src/sys/dev/pci/ixgbe/ixgbe.c:1.170
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.169 Thu Dec 6 13:25:02 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.c Sat Dec 8 14:57:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.169 2018/12/06 13:25:02 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.170 2018/12/08 14:57:11 msaitoh Exp $ */
/******************************************************************************
@@ -3566,7 +3566,8 @@ ixgbe_detach(device_t dev, int flags)
IXGBE_WRITE_REG(&adapter->hw, IXGBE_CTRL_EXT, ctrl_ext);
callout_halt(&adapter->timer, NULL);
- callout_halt(&adapter->recovery_mode_timer, NULL);
+ if (adapter->feat_en & IXGBE_FEATURE_RECOVERY_MODE)
+ callout_halt(&adapter->recovery_mode_timer, NULL);
if (adapter->feat_en & IXGBE_FEATURE_NETMAP)
netmap_detach(adapter->ifp);
