Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
hw/net: ne2000: Remove the logic of padding short frames in the recei…
…ve path

Now that we have implemented unified short frames padding in the
QEMU networking codes, remove the same logic in the NIC codes.

Signed-off-by: Bin Meng <bmeng@tinylab.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
  • Loading branch information
lbmeng authored and jasowang committed Jul 7, 2023
1 parent c58da33 commit 05db447
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions hw/net/ne2000.c
Expand Up @@ -167,15 +167,12 @@ static int ne2000_buffer_full(NE2000State *s)
return 0;
}

#define MIN_BUF_SIZE 60

ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
{
NE2000State *s = qemu_get_nic_opaque(nc);
size_t size = size_;
uint8_t *p;
unsigned int total_len, next, avail, len, index, mcast_idx;
uint8_t buf1[60];
static const uint8_t broadcast_macaddr[6] =
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

Expand Down Expand Up @@ -213,15 +210,6 @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
}
}


/* if too small buffer, then expand it */
if (size < MIN_BUF_SIZE) {
memcpy(buf1, buf, size);
memset(buf1 + size, 0, MIN_BUF_SIZE - size);
buf = buf1;
size = MIN_BUF_SIZE;
}

index = s->curpag << 8;
if (index >= NE2000_PMEM_END) {
index = s->start;
Expand Down

0 comments on commit 05db447

Please sign in to comment.