Module Name: src
Committed By: msaitoh
Date: Mon Aug 17 06:30:25 UTC 2020
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Add missing workqueue_wait() for the recovery_mode_timer workqueue.
To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 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.235 src/sys/dev/pci/ixgbe/ixgbe.c:1.236
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.235 Thu Aug 13 08:42:18 2020
+++ src/sys/dev/pci/ixgbe/ixgbe.c Mon Aug 17 06:30:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.235 2020/08/13 08:42:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.236 2020/08/17 06:30:25 msaitoh Exp $ */
/******************************************************************************
@@ -3522,6 +3522,13 @@ ixgbe_free_workqueue(struct adapter *ada
adapter->timer_wq = NULL;
}
if (adapter->recovery_mode_timer_wq != NULL) {
+ /*
+ * ixgbe_ifstop() doesn't call the workqueue_wait() for
+ * the recovery_mode_timer workqueue, so call it here.
+ */
+ workqueue_wait(adapter->recovery_mode_timer_wq,
+ &adapter->recovery_mode_timer_wc);
+ atomic_store_relaxed(&adapter->recovery_mode_timer_pending, 0);
workqueue_destroy(adapter->recovery_mode_timer_wq);
adapter->recovery_mode_timer_wq = NULL;
}
