mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 12:23:53 -06:00
hw/net: sunhme: Remove the logic of padding short frames in the receive 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>
This commit is contained in:
parent
aee87b43fe
commit
0fe0efc9cd
1 changed files with 0 additions and 11 deletions
|
@ -714,8 +714,6 @@ static inline void sunhme_set_rx_ring_nr(SunHMEState *s, int i)
|
||||||
s->erxregs[HME_ERXI_RING >> 2] = ring;
|
s->erxregs[HME_ERXI_RING >> 2] = ring;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MIN_BUF_SIZE 60
|
|
||||||
|
|
||||||
static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
|
static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
|
||||||
size_t size)
|
size_t size)
|
||||||
{
|
{
|
||||||
|
@ -724,7 +722,6 @@ static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
|
||||||
dma_addr_t rb, addr;
|
dma_addr_t rb, addr;
|
||||||
uint32_t intstatus, status, buffer, buffersize, sum;
|
uint32_t intstatus, status, buffer, buffersize, sum;
|
||||||
uint16_t csum;
|
uint16_t csum;
|
||||||
uint8_t buf1[60];
|
|
||||||
int nr, cr, len, rxoffset, csum_offset;
|
int nr, cr, len, rxoffset, csum_offset;
|
||||||
|
|
||||||
trace_sunhme_rx_incoming(size);
|
trace_sunhme_rx_incoming(size);
|
||||||
|
@ -775,14 +772,6 @@ static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
|
||||||
|
|
||||||
trace_sunhme_rx_filter_accept();
|
trace_sunhme_rx_filter_accept();
|
||||||
|
|
||||||
/* 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
rb = s->erxregs[HME_ERXI_RING >> 2] & HME_ERXI_RING_ADDR;
|
rb = s->erxregs[HME_ERXI_RING >> 2] & HME_ERXI_RING_ADDR;
|
||||||
nr = sunhme_get_rx_ring_count(s);
|
nr = sunhme_get_rx_ring_count(s);
|
||||||
cr = sunhme_get_rx_ring_nr(s);
|
cr = sunhme_get_rx_ring_nr(s);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue