[src/trunk]: src/sys/dev/pci/ixgbe Don't call callout_halt() if it's not init...

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

details:   https://anonhg.NetBSD.org/src/rev/94a2478a6c56
branches:  trunk
changeset: 995124:94a2478a6c56
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sat Dec 08 14:57:11 2018 +0000

description:
Don't call callout_halt() if it's not initialzied.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 34dd6ab4e257 -r 94a2478a6c56 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Sat Dec 08 14:55:53 2018 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Sat Dec 08 14:57:11 2018 +0000
@@ -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_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);