Fix if_timer logic to make sure that there is always a timeout

pending if there are packets queued for transmission.

Several drivers still have the same problem.

MFC after: 3 days

1 files changed, 3 insertions, 3 deletions

diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 99ef4dd..4ffe7a3 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -1292,9 +1292,6 @@ static void rl_txeof(sc)
 
 	ifp = &sc->arpcom.ac_if;
 
-	/* Clear the timeout timer. */
-	ifp->if_timer = 0;
-
 	/*
 	 * Go through our tx list and free mbufs for those
 	 * frames that have been uploaded.
@@ -1337,6 +1334,9 @@ static void rl_txeof(sc)
 		ifp->if_flags &= ~IFF_OACTIVE;
 	} while (sc->rl_cdata.last_tx != sc->rl_cdata.cur_tx);
 
+	ifp->if_timer =
+	    (sc->rl_cdata.last_tx == sc->rl_cdata.cur_tx) ? 0 : 5;
+
 	return;
 }