diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-26 01:18:11 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-26 01:18:11 +0000 |
| commit | 046588a3f5676450b42ab21bbc94009df885357f (patch) | |
| tree | 834c1c8ad6f491a6efeba709325342eaa07bc13a | |
| parent | c90daa1186258d136f2f45d20dbf698b4daee12c (diff) | |
update from netbsd tree
| -rw-r--r-- | sys/arch/hp300/conf/Makefile.hp300 | 6 | ||||
| -rw-r--r-- | sys/arch/hp300/stand/if_le.c | 14 |
2 files changed, 15 insertions, 5 deletions
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index 3e20caac14f..8e3920cef04 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.hp300,v 1.26 1995/09/19 23:34:06 thorpej Exp $ +# $NetBSD: Makefile.hp300,v 1.26.2.2 1995/10/22 03:41:15 thorpej Exp $ # @(#)Makefile.hp300 8.2 (Berkeley) 1/23/94 # @@ -36,7 +36,7 @@ HP300= ../.. INCLUDES= -I. -I$S/arch -I$S -I$S/sys COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dhp300 -DFPCOPROC -CFLAGS= -O6 -Werror -fno-builtin ${COPTS} +CFLAGS= -O6 -Werror ${COPTS} ### find out what to use for libkern .include "$S/lib/libkern/Makefile.inc" @@ -138,7 +138,7 @@ assym.s: Makefile assym.s: genassym ./genassym >assym.s -genassym: ${HP300}/hp300/genassym.c +genassym: ${HP300}/hp300/genassym.c Makefile ${CC} ${INCLUDES} ${IDENT} ${PARAM} -Dmc68020 -Dhp300 -o genassym \ ${HP300}/hp300/genassym.c diff --git a/sys/arch/hp300/stand/if_le.c b/sys/arch/hp300/stand/if_le.c index 26ed93fd473..24983328460 100644 --- a/sys/arch/hp300/stand/if_le.c +++ b/sys/arch/hp300/stand/if_le.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le.c,v 1.6 1995/09/02 05:04:18 thorpej Exp $ */ +/* $NetBSD: if_le.c,v 1.6.2.1 1995/10/19 20:42:41 thorpej Exp $ */ /* * Copyright (c) 1993 Adam Glass @@ -501,8 +501,18 @@ le_poll(desc, pkt, len) if (!length) goto cleanup; length -= 4; - if (length > 0) + + if (length > 0) { + /* + * If the length of the packet is greater than the size of the + * buffer, we have to truncate it, to avoid Bad Things. + * XXX Is this the right thing to do? + */ + if (length > len) + length = len; + bcopy(sc->sc_rbuf + (BUFSIZE * sc->sc_next_rd), pkt, length); + } cleanup: cdm->mcnt = 0; |