So instead of triggering a tx interrupt for each packet issue one for

each 128 packets or call et_txeof after 1 second whichever happens first.
looks good jsg@

2 files changed, 24 insertions, 5 deletions

diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c
index ac3f1cb2ed2..e91b66521d6 100644
--- a/sys/dev/pci/if_et.c
+++ b/sys/dev/pci/if_et.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_et.c,v 1.4 2007/11/25 17:41:00 claudio Exp $	*/
+/*	$OpenBSD: if_et.c,v 1.5 2007/11/26 10:39:55 claudio Exp $	*/
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
  * 
@@ -110,6 +110,7 @@ void	et_enable_intrs(struct et_softc *, uint32_t);
 void	et_disable_intrs(struct et_softc *);
 void	et_rxeof(struct et_softc *);
 void	et_txeof(struct et_softc *);
+void	et_txtick(void *);
 
 int	et_dma_alloc(struct et_softc *);
 void	et_dma_free(struct et_softc *);
@@ -150,7 +151,7 @@ void	et_tick(void *);
 
 static int	et_rx_intr_npkts = 32;
 static int	et_rx_intr_delay = 20;		/* x10 usec */
-static int	et_tx_intr_nsegs = 1;
+static int	et_tx_intr_nsegs = 128;
 static uint32_t	et_timer = 1000 * 1000 * 1000;	/* nanosec */
 
 struct et_bsize {
@@ -291,6 +292,7 @@ et_attach(struct device *parent, struct device *self, void *aux)
 	ether_ifattach(ifp);
 
 	timeout_set(&sc->sc_tick, et_tick, sc);
+	timeout_set(&sc->sc_txtick, et_txtick, sc);
 }
 
 int
@@ -469,6 +471,7 @@ et_stop(struct et_softc *sc)
 	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
 
 	timeout_del(&sc->sc_tick);
+	timeout_del(&sc->sc_txtick);
 
 	et_stop_rxdma(sc);
 	et_stop_txdma(sc);
@@ -1137,8 +1140,10 @@ et_start(struct ifnet *ifp)
 #endif
 	}
 
-	if (trans)
+	if (trans) {
+		timeout_add(&sc->sc_txtick, hz);
 		ifp->if_timer = 5;
+	}
 }
 
 void
@@ -1999,8 +2004,10 @@ et_txeof(struct et_softc *sc)
 		tbd->tbd_used--;
 	}
 
-	if (tbd->tbd_used == 0)
+	if (tbd->tbd_used == 0) {
+		timeout_del(&sc->sc_txtick);
 		ifp->if_timer = 0;
+	}
 	if (tbd->tbd_used + ET_NSEG_SPARE <= ET_TX_NDESC)
 		ifp->if_flags &= ~IFF_OACTIVE;
 
@@ -2008,6 +2015,17 @@ et_txeof(struct et_softc *sc)
 }
 
 void
+et_txtick(void *xsc)
+{
+	struct et_softc *sc = xsc;
+	int s;
+
+	s = splnet();
+	et_txeof(sc);
+	splx(s);
+}
+
+void
 et_tick(void *xsc)
 {
 	struct et_softc *sc = xsc;
diff --git a/sys/dev/pci/if_etreg.h b/sys/dev/pci/if_etreg.h
index 9b01eb25755..af396ff29cd 100644
--- a/sys/dev/pci/if_etreg.h
+++ b/sys/dev/pci/if_etreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_etreg.h,v 1.1 2007/10/30 12:31:07 jsg Exp $	*/
+/*	$OpenBSD: if_etreg.h,v 1.2 2007/11/26 10:39:55 claudio Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -507,6 +507,7 @@ struct et_softc {
 
 	struct et_txdesc_ring	sc_tx_ring;
 	struct et_txstatus_data	sc_tx_status;
+	struct timeout		sc_txtick;
 
 	bus_dmamap_t		sc_mbuf_tmp_dmap;
 	struct et_rxbuf_data	sc_rx_data[ET_RX_NRING];