[src/netbsd-8]: src/sys/dev/pci Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/acd23d109223
branches:  netbsd-8
changeset: 318924:acd23d109223
user:      martin <martin%NetBSD.org@localhost>
date:      Wed May 09 15:28:44 2018 +0000
description:
Pull up following revision(s) (requested by msaitoh in ticket #816):

        sys/dev/pci/if_wm.c: revision 1.578

  Fix a bug that TX might stall because WM_TXQ_NO_SPACE is not cleared in
if_init() (though I've never seen this problem). Clear txq->txq_flags in
wm_init_tx_queue(). OK'd by knakahara.

diffstat:

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

diffs (26 lines):

diff -r 01a3cfa5f48e -r acd23d109223 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Wed May 09 15:21:02 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Wed May 09 15:28:44 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.508.4.17 2018/04/16 14:25:49 martin Exp $  */
+/*     $NetBSD: if_wm.c,v 1.508.4.18 2018/05/09 15:28:44 martin 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.508.4.17 2018/04/16 14:25:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.18 2018/05/09 15:28:44 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -6696,6 +6696,7 @@
        wm_init_tx_regs(sc, wmq, txq);
        wm_init_tx_buffer(sc, txq);
 
+       txq->txq_flags = 0; /* Clear WM_TXQ_NO_SPACE */
        txq->txq_watchdog = false;
 }