|
@@ -1084,7 +1084,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
|
|
uint32_t fcs = ~0;
|
|
uint32_t fcs = ~0;
|
|
uint8_t *p = src;
|
|
uint8_t *p = src;
|
|
|
|
|
|
- while (p != &src[size-4])
|
|
|
|
|
|
+ while (p != &src[size])
|
|
CRC(fcs, *p++);
|
|
CRC(fcs, *p++);
|
|
crc_err = (*(uint32_t *)p != htonl(fcs));
|
|
crc_err = (*(uint32_t *)p != htonl(fcs));
|
|
}
|
|
}
|
|
@@ -1233,8 +1233,10 @@ static void pcnet_transmit(PCNetState *s)
|
|
bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT);
|
|
bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT);
|
|
|
|
|
|
/* if multi-tmd packet outsizes s->buffer then skip it silently.
|
|
/* if multi-tmd packet outsizes s->buffer then skip it silently.
|
|
- Note: this is not what real hw does */
|
|
|
|
- if (s->xmit_pos + bcnt > sizeof(s->buffer)) {
|
|
|
|
|
|
+ * Note: this is not what real hw does.
|
|
|
|
+ * Last four bytes of s->buffer are used to store CRC FCS code.
|
|
|
|
+ */
|
|
|
|
+ if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) {
|
|
s->xmit_pos = -1;
|
|
s->xmit_pos = -1;
|
|
goto txdone;
|
|
goto txdone;
|
|
}
|
|
}
|