Module Name: src Committed By: msaitoh Date: Tue May 8 11:36:40 UTC 2018
Modified Files: src/sys/dev/pci: if_wm.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.577 -r1.578 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.577 src/sys/dev/pci/if_wm.c:1.578 --- src/sys/dev/pci/if_wm.c:1.577 Tue May 8 07:59:56 2018 +++ src/sys/dev/pci/if_wm.c Tue May 8 11:36:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.577 2018/05/08 07:59:56 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.578 2018/05/08 11:36:39 msaitoh 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.577 2018/05/08 07:59:56 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.578 2018/05/08 11:36:39 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -6703,6 +6703,7 @@ wm_init_tx_queue(struct wm_softc *sc, st wm_init_tx_regs(sc, wmq, txq); wm_init_tx_buffer(sc, txq); + txq->txq_flags = 0; /* Clear WM_TXQ_NO_SPACE */ txq->txq_sending = false; }