Module Name: src
Committed By: martin
Date: Sat Jun 3 14:44:34 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-10]: if_aq.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #187):
sys/dev/pci/if_aq.c: revision 1.45
aq(4): if_transmit: Invoke softint_schedule(9) with kpreempt disabled.
To generate a diff of this commit:
cvs rdiff -u -r1.39.2.1 -r1.39.2.2 src/sys/dev/pci/if_aq.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/if_aq.c
diff -u src/sys/dev/pci/if_aq.c:1.39.2.1 src/sys/dev/pci/if_aq.c:1.39.2.2
--- src/sys/dev/pci/if_aq.c:1.39.2.1 Mon Jan 30 11:52:22 2023
+++ src/sys/dev/pci/if_aq.c Sat Jun 3 14:44:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aq.c,v 1.39.2.1 2023/01/30 11:52:22 martin Exp $ */
+/* $NetBSD: if_aq.c,v 1.39.2.2 2023/06/03 14:44:34 martin Exp $ */
/**
* aQuantia Corporation Network Driver
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.39.2.1 2023/01/30 11:52:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.39.2.2 2023/06/03 14:44:34 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_aq.h"
@@ -5901,7 +5901,9 @@ aq_transmit(struct ifnet *ifp, struct mb
aq_send_common_locked(ifp, sc, txring, true);
mutex_exit(&txring->txr_mutex);
} else {
+ kpreempt_disable();
softint_schedule(txring->txr_softint);
+ kpreempt_enable();
}
return 0;
}