Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci Turn a locking botch (shouldn't drop lock on err...
details: https://anonhg.NetBSD.org/src/rev/9c524e4e8be5
branches: trunk
changeset: 368557:9c524e4e8be5
user: skrll <skrll%NetBSD.org@localhost>
date: Tue Jul 19 06:46:29 2022 +0000
description:
Turn a locking botch (shouldn't drop lock on error) into a KASSERT
diffstat:
sys/dev/pci/if_wm.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diffs (31 lines):
diff -r f47fda3c4ebb -r 9c524e4e8be5 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c Tue Jul 19 01:03:05 2022 +0000
+++ b/sys/dev/pci/if_wm.c Tue Jul 19 06:46:29 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.740 2022/07/11 06:16:23 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.741 2022/07/19 06:46:29 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.740 2022/07/11 06:16:23 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.741 2022/07/19 06:46:29 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -8927,11 +8927,7 @@
int qid = wmq->wmq_id;
KASSERT(mutex_owned(txq->txq_lock));
-
- if (txq->txq_stopping) {
- mutex_exit(txq->txq_lock);
- return;
- }
+ KASSERT(!txq->txq_stopping);
if ((sc->sc_flags & WM_F_NEWQUEUE) != 0) {
/* XXX need for ALTQ or one CPU system */
Home |
Main Index |
Thread Index |
Old Index