Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sometimes the ec board reports a packet length that's too large.

Browse Source 
Try to deal with this by clipping the packet length, and, under
DEBUG, printf when we do.  Also zero out the packet status in
the buffer before we give it back to the board.
This commit is contained in:
fredette 2001-08-17 20:27:12 +00:00
parent de14426106
commit e5769f5f01
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/sun2/dev/if_ec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ec.c,v 1.1 2001/06/27 17:24:35 fredette Exp $ */
/* $NetBSD: if_ec.c,v 1.2 2001/08/17 20:27:12 fredette Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -494,6 +494,15 @@ ec_recv(sc, intbit)
total_length = doff - EC_PKT_RDOFF;
buf += EC_PKT_RDOFF;
/* XXX - sometimes the card reports a large data offset. */
if (total_length > (ETHER_MAX_LEN - ETHER_CRC_LEN)) {
#ifdef DEBUG
printf("%s: fixing too-large length of %d\n",
sc->sc_dev.dv_xname, total_length);
#endif
total_length = (ETHER_MAX_LEN - ETHER_CRC_LEN);
}
MGETHDR(m0, M_DONTWAIT, MT_DATA);
if (m0 == 0)
break;
@ -548,6 +557,8 @@ ec_recv(sc, intbit)
}
/* Give the receive buffer back to the card. */
buf = EC_CSR_INT_BUF(intbit);
bus_space_write_2(sc->sc_iot, sc->sc_ioh, buf, 0);
ECREG_CSR_WR((ECREG_CSR_RD & EC_CSR_INTPA) | EC_CSR_INT_BSW(intbit) | intbit);
}

4
sys/arch/sun2/dev/if_ecreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ecreg.h,v 1.2 2001/08/14 03:57:16 fredette Exp $ */
/* $NetBSD: if_ecreg.h,v 1.3 2001/08/17 20:27:12 fredette Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -112,4 +112,4 @@ struct ec_regs {
#define EC_PKT_MAXTDOFF (EC_BUF_SZ - (ETHER_MIN_LEN - ETHER_CRC_LEN)) /* max xmit doff (min size) */
#define EC_PKT_RDOFF 2 /* packet offset in buffer */
#define EC_PKT_MINRDOFF (EC_PKT_RDOFF + (ETHER_MIN_LEN - ETHER_CRC_LEN)) /* min packet doff (min size) */
#define EC_PKT_MAXRDOFF (EC_PKT_RDOFF + (ETHER_MAX_LEN - ETHER_CRC_LEN)) /* max packet doff (max size) */
#define EC_PKT_MAXRDOFF (EC_BUF_SZ - EC_PKT_RDOFF) /* max packet doff (max size) */