Sat Aug 20 19:04:07 2022 UTC ()

gfe_ifstart(): Replace "IF_DEQUEUE() -> IF_PREPEND() on failure" with
"IF_POLL() -> IF_DEQUEUE() on success".


(thorpej)

diff -r1.59 -r1.60 src/sys/dev/marvell/if_gfe.c

--- src/sys/dev/marvell/if_gfe.c 2021/08/07 16:19:13	1.59
+++ src/sys/dev/marvell/if_gfe.c 2022/08/20 19:04:07	1.60

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_gfe.c,v 1.59 2021/08/07 16:19:13 thorpej Exp $	*/
+/*	$NetBSD: if_gfe.c,v 1.60 2022/08/20 19:04:07 thorpej Exp $	*/
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -32,27 +32,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * if_gfe.c -- GT ethernet MAC driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.59 2021/08/07 16:19:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.60 2022/08/20 19:04:07 thorpej Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/socket.h>
 @@ -681,54 +681,55 @@ void
 gfe_ifstart(struct ifnet *ifp)
+{
 	struct gfe_softc * const sc = ifp->if_softc;
 	struct mbuf *m;
 	GE_FUNC_ENTER(sc, "gfe_ifstart");
 	if ((ifp->if_flags & IFF_RUNNING) == 0) {
 		GE_FUNC_EXIT(sc, "$");
 		return;
+	}
 	for (;;) {
-		IF_DEQUEUE(&ifp->if_snd, m);
+		IF_POLL(&ifp->if_snd, m);
 		if (m == NULL) {
 			ifp->if_flags &= ~IFF_OACTIVE;
 			GE_FUNC_EXIT(sc, "");
 			return;
+		}
 		/*
 		 * No space in the pending queue?  try later.
 		 */
 		if (IF_QFULL(&sc->sc_txq[GE_TXPRIO_HI].txq_pendq))
 			break;
 		IF_DEQUEUE(&ifp->if_snd, m);
 		/*
 		 * Try to enqueue a mbuf to the device. If that fails, we
 		 * can always try to map the next mbuf.
 		 */
 		IF_ENQUEUE(&sc->sc_txq[GE_TXPRIO_HI].txq_pendq, m);
 		GE_DPRINTF(sc, (">"));
 #ifndef GE_NOTX
 		(void) gfe_tx_enqueue(sc, GE_TXPRIO_HI);
 #endif
+	}
 	/*
 	 * Attempt to queue the mbuf for send failed.
 	 */
 	IF_PREPEND(&ifp->if_snd, m);
 	ifp->if_flags |= IFF_OACTIVE;
 	GE_FUNC_EXIT(sc, "%%");
+}
 void
 gfe_ifwatchdog(struct ifnet *ifp)
+{
 	struct gfe_softc * const sc = ifp->if_softc;
 	struct gfe_txqueue * const txq = &sc->sc_txq[GE_TXPRIO_HI];
 	GE_FUNC_ENTER(sc, "gfe_ifwatchdog");
 	aprint_error_dev(sc->sc_dev, "device timeout");
 	if (ifp->if_flags & IFF_RUNNING) {