[src/trunk]: src/sys/dev/pci Fix if_wm.c:r1.557 merge miss, sorry.

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

details:   https://anonhg.NetBSD.org/src/rev/72e2ae5c9917
branches:  trunk
changeset: 829400:72e2ae5c9917
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Mon Jan 29 03:42:30 2018 +0000

description:
Fix if_wm.c:r1.557 merge miss, sorry.

diffstat:

 sys/dev/pci/if_wm.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 1df2bff41085 -r 72e2ae5c9917 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Mon Jan 29 03:35:23 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Mon Jan 29 03:42:30 2018 +0000
@@ -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 @@
         * 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