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

Eliminate use of M_HASFCS. Use a buffer large enough to receive a

Browse Source 
full-length Ethernet frame.
This commit is contained in:
thorpej 2005-01-30 19:24:05 +00:00
parent 53eac4d6eb
commit 22044e51d1
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/dev/ofw/ofnet.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofnet.c,v 1.31 2003/01/15 22:01:57 bouyer Exp $ */
/* $NetBSD: ofnet.c,v 1.32 2005/01/30 19:24:05 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.31 2003/01/15 22:01:57 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.32 2005/01/30 19:24:05 thorpej Exp $");
#include "ofnet.h"
#include "opt_inet.h"
@ -166,7 +166,7 @@ ofnet_attach(struct device *parent, struct device *self, void *aux)
ether_ifattach(ifp, myaddr);
}
static char buf[ETHERMTU + sizeof(struct ether_header)];
static char buf[ETHER_MAX_LEN];
static void
ofnet_read(struct ofnet_softc *of)
@ -190,6 +190,17 @@ ofnet_read(struct ofnet_softc *of)
}
bufp = buf;
/*
* We don't know if the interface included the FCS
* or not. For now, assume that it did if we got
* a packet length that looks like it could include
* the FCS.
*
* XXX Yuck.
*/
if (len > ETHER_MAX_LEN - ETHER_CRC_LEN)
len = ETHER_MAX_LEN - ETHER_CRC_LEN;
/* Allocate a header mbuf */
MGETHDR(m, M_DONTWAIT, MT_DATA);
if (m == 0) {
@ -199,18 +210,6 @@ ofnet_read(struct ofnet_softc *of)
m->m_pkthdr.rcvif = ifp;
m->m_pkthdr.len = len;
/*
* We don't know if the interface included the FCS
* or not. For now, assume that it did if we got
* a packet length that looks like it could include
* the FCS.
*
* XXX Yuck.
*/
if (len > (ETHER_MAX_LEN - ETHER_CRC_LEN))
m->m_flags |= M_HASFCS;
l = MHLEN;
head = 0;
mp = &head;