summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-06-24 00:49:37 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-06-24 00:49:37 +0000
commite165c27d75113b5ae851efde98eb49ffd1c6bce3 (patch)
treee05f06f90e4c83825a407e32dbd0fd3f7b5c1a05 /sys/dev
parent83d706d47d4c14d3e0e370eceabc8de6c4eeb9ef (diff)
make em_fixup_rx() a void function.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_em.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 253199aeb92..d2d598fdef0 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
-/* $OpenBSD: if_em.c,v 1.131 2006/05/31 02:09:18 brad Exp $ */
+/* $OpenBSD: if_em.c,v 1.132 2006/06/24 00:49:36 brad Exp $ */
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
#include <dev/pci/if_em.h>
@@ -144,7 +144,7 @@ int em_allocate_receive_structures(struct em_softc *);
int em_allocate_transmit_structures(struct em_softc *);
void em_process_receive_interrupts(struct em_softc *, int);
#ifdef __STRICT_ALIGNMENT
-int em_fixup_rx(struct em_softc *);
+void em_fixup_rx(struct em_softc *);
#endif
void em_receive_checksum(struct em_softc *, struct em_rx_desc *,
struct mbuf *);
@@ -2452,11 +2452,10 @@ em_process_receive_interrupts(struct em_softc *sc, int count)
* Be aware, best performance of the 8254x chipset is achived only when Jumbo
* frames are not used at all on strict alignment architectures.
*/
-int
+void
em_fixup_rx(struct em_softc *sc)
{
struct mbuf *m, *n;
- int error = 0;
m = sc->fmp;
if (m->m_len <= (MCLBYTES - ETHER_HDR_LEN)) {
@@ -2476,11 +2475,8 @@ em_fixup_rx(struct em_softc *sc)
sc->dropped_pkts++;
m_freem(sc->fmp);
sc->fmp = NULL;
- error = ENOMEM;
}
}
-
- return (error);
}
#endif