Repair: grrrrrr... brought in wrong changes -again-

1 files changed, 2 insertions, 26 deletions

diff --git a/sys/arch/sparc/dev/hme.c b/sys/arch/sparc/dev/hme.c
index 5de558f8648..9d7cd80967f 100644
--- a/sys/arch/sparc/dev/hme.c
+++ b/sys/arch/sparc/dev/hme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hme.c,v 1.25 2000/11/28 05:04:32 jason Exp $	*/
+/*	$OpenBSD: hme.c,v 1.26 2000/11/28 05:12:18 jason Exp $	*/
 
 /*
  * Copyright (c) 1998 Jason L. Wright (jason@thought.net)
@@ -482,7 +482,6 @@ hme_meminit(sc)
 		sc->sc_bufs_dva = (struct hme_bufs *) dvma_malloc(
 		    sizeof(struct hme_bufs), &sc->sc_bufs, M_NOWAIT);
 
-	
 	desc = sc->sc_desc;
 
 	/*
@@ -508,29 +507,6 @@ hme_meminit(sc)
 }
 
 void
-hme_rxd_ref(m)
-	struct mbuf *m;
-{
-	struct hme_softrxd *d = m->m_ext_handle;
-
-	d->rxd_ref++;
-}
-
-void
-hme_rxd_free(m)
-	struct mbuf *m;
-{
-	struct hme_softrxd *d = m->m_ext_handle;
-
-	if (d->rxd_ref <= 0)
-		panic("hme_rxd_free: ref %d", d->rxd_ref);
-	d->rxd_ref--;
-	if (d->rxd_ref == 0) {
-		dvma_free(
-	}
-}
-
-void
 hmeinit(sc)
 	struct hme_softc *sc;
 {
@@ -754,7 +730,7 @@ hme_rint(sc)
 	bix = sc->sc_last_rd;
 
 	for (;;) {
-		rxd->rx_flags = &sc->sc_desc->hme_rxd[bix];
+		bcopy(&sc->sc_desc->hme_rxd[bix], &rxd, sizeof(rxd));
 		len = rxd.rx_flags >> 16;
 
 		if (rxd.rx_flags & HME_RXD_OWN)