Module Name: src
Committed By: knakahara
Date: Mon Jan 29 03:42:30 UTC 2018
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix if_wm.c:r1.557 merge miss, sorry.
To generate a diff of this commit:
cvs rdiff -u -r1.559 -r1.560 src/sys/dev/pci/if_wm.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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.559 src/sys/dev/pci/if_wm.c:1.560
--- src/sys/dev/pci/if_wm.c:1.559 Fri Jan 26 16:25:28 2018
+++ src/sys/dev/pci/if_wm.c Mon Jan 29 03:42:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.559 2018/01/26 16:25:28 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.560 2018/01/29 03:42:30 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.559 2018/01/26 16:25:28 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.560 2018/01/29 03:42:30 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -2983,9 +2983,7 @@ wm_watchdog_txq_locked(struct ifnet *ifp
* Since we're using delayed interrupts, sweep up
* before we report an error.
*/
- mutex_enter(txq->txq_lock);
wm_txeof(txq, UINT_MAX);
- mutex_exit(txq->txq_lock);
if (txq->txq_free != WM_NTXDESC(txq)) {
#ifdef WM_DEBUG
